rpms/xorg-x11-drv-i810/devel intel-2.1.1-disable-ttm.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.84, 1.85

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Wed Mar 12 07:02:56 UTC 2008


Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-disable-ttm.patch 
Log Message:
* 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


intel-2.1.1-disable-ttm.patch:

--- NEW FILE intel-2.1.1-disable-ttm.patch ---
diff -up xf86-video-intel-2.2.1/src/i830_memory.c.disablettm xf86-video-intel-2.2.1/src/i830_memory.c
--- xf86-video-intel-2.2.1/src/i830_memory.c.disablettm	2008-03-12 16:45:55.000000000 +1000
+++ xf86-video-intel-2.2.1/src/i830_memory.c	2008-03-12 16:46:22.000000000 +1000
@@ -441,8 +441,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, u
      * 5.4 or newer so we can rely on the lock being held after DRIScreenInit,
      * rather than after DRIFinishScreenInit.
      */
-    if (pI830->directRenderingEnabled && pI830->drmMinor >= 7 &&
-	(dri_major > 5 || (dri_major == 5 && dri_minor >= 4)))
+    if (0) //pI830->directRenderingEnabled && pI830->drmMinor >= 7 &&
+//	(dri_major > 5 || (dri_major == 5 && dri_minor >= 4)))
     {
 	int mmsize;
 


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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- xorg-x11-drv-i810.spec	10 Mar 2008 04:44:53 -0000	1.84
+++ xorg-x11-drv-i810.spec	12 Mar 2008 07:02:08 -0000	1.85
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -25,6 +25,7 @@
 Patch5: intel-2.1.1-efi.patch
 Patch6: intel-2.1.1-pciaccess-version.patch
 Patch7: intel-quirk-dvo.patch
+Patch8: intel-2.1.1-disable-ttm.patch
 
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
@@ -67,6 +68,7 @@
 %patch5 -p1 -b .efi
 %patch6 -p1 -b .pciaccessvers
 %patch7 -p1 -b .quirk
+%patch8 -p1 -b .disablettm
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -137,6 +139,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* 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
+
 * Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 2.2.1-10
 - quirk Motion Computing M1200
 




More information about the fedora-extras-commits mailing list