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

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Fri Mar 14 00:13:14 UTC 2008


Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-fix-modeset-vt-switch.patch 
Log Message:
* 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


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

--- NEW FILE intel-fix-modeset-vt-switch.patch ---
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
@@ -3388,10 +3388,13 @@ I830EnterVT(int scrnIndex, int flags)
 
       if (!pI830->starting) {
 	 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();
+         }
 	 DPRINTF(PFX, "calling dri unlock\n");
 	 I830DRIUnlock(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.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- xorg-x11-drv-i810.spec	12 Mar 2008 07:02:08 -0000	1.85
+++ xorg-x11-drv-i810.spec	14 Mar 2008 00:12:38 -0000	1.86
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,6 +31,7 @@
 Patch101: intel-batchbuffer.patch
 Patch102: intel-modeset.patch
 Patch103: intel-disable-stepping.patch
+Patch104: intel-fix-modeset-vt-switch.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -76,6 +77,7 @@
 %patch101 -p1 -b .intel-batchbuffer
 %patch102 -p1 -b .intel-modeset
 %patch103 -p1 -b .intel-stepping
+%patch104 -p1 -b .intel-fix-vt-modeset
 
 %build
 
@@ -139,6 +141,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* 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
+
 * Wed Mar 12 2008 Dave Airlie <airlied at redhat.com> 2.2.1-11
 - fall intel master driver back to non-TTM mode avoids compiz fail
 




More information about the fedora-extras-commits mailing list