rpms/xorg-x11-drv-intel/devel intel-2.12-fix-uxa-planemask.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.46, 1.47

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.12-fix-uxa-planemask.patch 
Log Message:
* Mon Jul 05 2010 Dave Airlie <airlied at redhat.com> 2.12.0-2
- add fix for UXA planemask issue


intel-2.12-fix-uxa-planemask.patch:
 uxa-accel.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE intel-2.12-fix-uxa-planemask.patch ---
>From feff2ec80eeeba5074d19efcddf4867adf639b4f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 5 Jul 2010 09:07:08 +1000
Subject: [PATCH] uxa: don't compare planemask with FB_ALLONES.

planemask is an unsigned long initialised to ~0, on 64-bit this is not equal
to an (unsigned int)-1.

Use the macro provided to do this.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 uxa/uxa-accel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index ded66a1..633b433 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -81,7 +81,7 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
 	if (!dst_pixmap)
 		goto fallback;
 
-	if (pGC->alu != GXcopy || pGC->planemask != FB_ALLONES)
+	if (pGC->alu != GXcopy || !UXA_IS_PM_SOLID(pDrawable, pGC->planemask))
 		goto solid;
 
 	format = PictureMatchFormat(screen,
@@ -1048,7 +1048,7 @@ uxa_fill_region_solid(DrawablePtr pDrawable,
 	extents = REGION_EXTENTS(screen, pRegion);
 
 	/* Using GEM, the relocation costs outweigh the advantages of the blitter */
-	if (nbox == 1 || (alu != GXcopy && alu != GXclear) || planemask != FB_ALLONES) {
+	if (nbox == 1 || (alu != GXcopy && alu != GXclear) || !UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) {
 try_solid:
 		if (uxa_screen->info->check_solid &&
 		    !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask))
-- 
1.7.1



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- xorg-x11-drv-intel.spec	25 Jun 2010 15:58:32 -0000	1.46
+++ xorg-x11-drv-intel.spec	4 Jul 2010 23:11:14 -0000	1.47
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.12.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,9 @@ Patch20: intel-2.8.0-kms-get-crtc.patch
 Patch21: intel-2.11-lvds-first.patch
 Patch22: intel-2.11.0-vga-clock-max.patch
 
+# backported
+Patch23: intel-2.12-fix-uxa-planemask.patch
+
 Patch60: uevent.patch
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=27885
@@ -92,6 +95,7 @@ Debugging tools for Intel graphics chips
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch22 -p1 -b .vga-clock
+%patch23 -p1 -b .uxa-fix
 %patch60 -p1 -b .uevent
 %patch61 -p1 -b .mbp-backlight
 %patch62 -p1 -b .no-flip
@@ -145,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Jul 05 2010 Dave Airlie <airlied at redhat.com> 2.12.0-2
+- add fix for UXA planemask issue
+
 * Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.12.0-1
 - intel 2.12.0
 - new gpu-tools snapshot