rpms/xorg-x11-drv-intel/F-13 intel-2.11-no-pageflipping.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.49, 1.50

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27917

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.11-no-pageflipping.patch 
Log Message:
* Mon May 03 2010 Adam Jackson <ajax at redhat.com> 2.11.0-4
- intel-2.11-no-pageflipping.patch: Disable pageflipping (#588421)


intel-2.11-no-pageflipping.patch:
 drmmode_display.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE intel-2.11-no-pageflipping.patch ---
diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.jx xf86-video-intel-2.11.0/src/drmmode_display.c
--- xf86-video-intel-2.11.0/src/drmmode_display.c.jx	2010-05-03 13:23:11.000000000 -0400
+++ xf86-video-intel-2.11.0/src/drmmode_display.c	2010-05-03 13:31:42.000000000 -0400
@@ -1504,7 +1504,15 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, 
 	gp.value = &has_flipping;
 	(void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp,
 				  sizeof(gp));
-	if (has_flipping) {
+
+	if (1) {
+		xf86DrvMsg(scrnIndex, X_INFO,
+			   "Pageflipping %s in kernel, %s disabled in X\n",
+			   has_flipping ? "enabled" : "disabled",
+			   has_flipping ? "but" : "and");
+		xf86DrvMsg(scrnIndex, X_INFO,
+			   "Don't panic: https://bugzilla.redhat.com/588421\n");
+	} else if (has_flipping) {
 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			   "Kernel page flipping support detected, enabling\n");
 		intel->use_pageflipping = TRUE;


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/xorg-x11-drv-intel.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-intel.spec	30 Apr 2010 16:49:43 -0000	1.49
+++ xorg-x11-drv-intel.spec	3 May 2010 17:34:16 -0000	1.50
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.11.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -34,6 +34,9 @@ Patch60: uevent.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=27885
 Patch61: intel-2.10.0-add-mbp-backlight.patch
 
+# https://bugzilla.redhat.com/588421
+Patch62: intel-2.11-no-pageflipping.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
@@ -91,6 +94,7 @@ Debugging tools for Intel graphics chips
 %patch22 -p1 -b .vga-clock
 %patch60 -p1 -b .uevent
 %patch61 -p1 -b .mbp-backlight
+%patch62 -p1 -b .no-flip
 
 %build
  
@@ -141,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon May 03 2010 Adam Jackson <ajax at redhat.com> 2.11.0-4
+- intel-2.11-no-pageflipping.patch: Disable pageflipping (#588421)
+
 * Fri Apr 30 2010 Bastien Nocera <bnocera at redhat.com> 2.11.0-3
 - Add MacBook backlight support