rpms/xorg-x11-drv-i810/devel intel-fix-modeset-vt-switch.patch, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.86, 1.87

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Tue Mar 18 05:36:22 UTC 2008


Author: airlied

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

Modified Files:
	intel-fix-modeset-vt-switch.patch xorg-x11-drv-i810.spec 
Log Message:
* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-13
- fix modesetting for normal DRI codepath


intel-fix-modeset-vt-switch.patch:

Index: intel-fix-modeset-vt-switch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-fix-modeset-vt-switch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-fix-modeset-vt-switch.patch	14 Mar 2008 00:12:38 -0000	1.1
+++ intel-fix-modeset-vt-switch.patch	18 Mar 2008 05:36:13 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 953762b..46cfa0d 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
+diff -up xf86-video-intel-2.2.0-188-g49af3c4/src/i830_driver.c.intel-fix-vt-modeset xf86-video-intel-2.2.0-188-g49af3c4/src/i830_driver.c
+--- xf86-video-intel-2.2.0-188-g49af3c4/src/i830_driver.c.intel-fix-vt-modeset	2008-03-18 15:33:39.000000000 +1000
++++ xf86-video-intel-2.2.0-188-g49af3c4/src/i830_driver.c	2008-03-18 15:34:43.000000000 +1000
 @@ -3388,10 +3388,13 @@ I830EnterVT(int scrnIndex, int flags)
  
        if (!pI830->starting) {
@@ -19,3 +18,18 @@
  	 DPRINTF(PFX, "calling dri unlock\n");
  	 I830DRIUnlock(pScrn);
        }
+@@ -3431,9 +3434,11 @@ I830EnterVT(int scrnIndex, int flags)
+ 
+ 	 I830DRIResume(screenInfo.screens[scrnIndex]);
+       
+-	 i830_refresh_ring(pScrn);
+-	 I830Sync(pScrn);
+-	 DO_RING_IDLE();
++         if (!pI830->use_drm_mode) {
++	     i830_refresh_ring(pScrn);
++	     I830Sync(pScrn);
++	     DO_RING_IDLE();
++	 }
+ 
+ 	 sarea->texAge++;
+ 	 for(i = 0; i < I830_NR_TEX_REGIONS+1 ; i++)


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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- xorg-x11-drv-i810.spec	14 Mar 2008 00:12:38 -0000	1.86
+++ xorg-x11-drv-i810.spec	18 Mar 2008 05:36:13 -0000	1.87
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -141,6 +141,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-13
+- fix modesetting for normal DRI codepath
+
 * Fri Mar 14 2008 Dave Airlie <airlied at redhat.com> 2.2.1-12
 - fix modesetting vt switch to not hit the non-existant ring
 




More information about the fedora-extras-commits mailing list