rpms/xorg-x11-drv-i810/devel intel-modeset.patch, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.79, 1.80

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Thu Mar 6 07:09:17 UTC 2008


Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3595

Modified Files:
	intel-modeset.patch xorg-x11-drv-i810.spec 
Log Message:
* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.2.1-6
- fix modesetting to start on i965 chips


intel-modeset.patch:

Index: intel-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-modeset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-modeset.patch	6 Mar 2008 06:51:07 -0000	1.1
+++ intel-modeset.patch	6 Mar 2008 07:08:53 -0000	1.2
@@ -1018,7 +1018,7 @@
      info.sarea_priv_offset = 0;
      info.sarea_handle = sarea_handle;
 diff --git a/src/i830_driver.c b/src/i830_driver.c
-index ba44645..8c13a15 100644
+index ba44645..ef9ac24 100644
 --- a/src/i830_driver.c
 +++ b/src/i830_driver.c
 @@ -198,6 +198,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -2050,6 +2050,15 @@
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Not available\n");
  #endif
  
+@@ -3035,7 +3166,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+    if (serverGeneration == 1)
+       xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+ 
+-   if (IS_I965G(pI830)) {
++   if (!pI830->use_drm_mode && IS_I965G(pI830)) {
+       /* turn off clock gating */
+ #if 0
+       OUTREG(0x6204, 0x70804000);
 @@ -3124,9 +3255,11 @@ I830LeaveVT(int scrnIndex, int flags)
  
     xf86_hide_cursors (pScrn);


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xorg-x11-drv-i810.spec	6 Mar 2008 06:51:07 -0000	1.79
+++ xorg-x11-drv-i810.spec	6 Mar 2008 07:08:53 -0000	1.80
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -128,6 +128,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.2.1-6
+- fix modesetting to start on i965 chips
+
 * Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.2.1-5
 - Bump to include modesetting driver - and make stub auto pick
   batchbuffer branch if modesetting enabled




More information about the fedora-extras-commits mailing list