rpms/xorg-x11-drv-nouveau/F-11 rh508970.patch, NONE, 1.1 xorg-x11-drv-nouveau.spec, 1.53, 1.54

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22943

Modified Files:
	xorg-x11-drv-nouveau.spec 
Added Files:
	rh508970.patch 
Log Message:
* Sat Aug 8 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-41.20090528git0c17b87
- rh#508970: fix for minor corruption at depth 16



rh508970.patch:
 nv04_exa.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE rh508970.patch ---
>From 712064e6188d65e2c7d85078b95a0292edcad0e7 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Wed, 5 Aug 2009 14:00:51 +1000
Subject: [PATCH] nv04-nv40/exa: set cliprect to drawing area for IFC

---
 src/nv04_exa.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv04_exa.c b/src/nv04_exa.c
index de5da67..132c9d5 100644
--- a/src/nv04_exa.c
+++ b/src/nv04_exa.c
@@ -321,8 +321,8 @@ NV04EXAUploadIFC(ScrnInfoPtr pScrn, const char *src, int src_pitch,
 		return FALSE;
 
 	BEGIN_RING(chan, clip, NV01_CONTEXT_CLIP_RECTANGLE_POINT, 2);
-	OUT_RING  (chan, 0x0); 
-	OUT_RING  (chan, 0x7FFF7FFF);
+	OUT_RING  (chan, (y << 16) | x);
+	OUT_RING  (chan, (h << 16) | w);
 	BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_OPERATION, 2);
 	OUT_RING  (chan, NV01_IMAGE_FROM_CPU_OPERATION_SRCCOPY);
 	OUT_RING  (chan, ifc_fmt);
-- 
1.6.4



Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-nouveau.spec	18 Jun 2009 15:06:29 -0000	1.53
+++ xorg-x11-drv-nouveau.spec	8 Aug 2009 03:44:39 -0000	1.54
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   40.%{snapshot}%{?dist}
+Release:   41.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -50,6 +50,7 @@ Patch5: dcbconf_7_4_ignore.diff
 Patch6: nouveau-fb-resize.patch
 Patch7: nouveau-bicubic-2x.patch
 Patch8: nv50-pramin-vbios.patch
+Patch9: rh508970.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -66,6 +67,7 @@ X.Org X11 nouveau video driver.
 %patch6 -p1 -b .fbresize
 %patch7 -p1 -b .bicubic
 %patch8 -p1 -b .pramin_bios
+%patch9 -p1 -b .rh508970
 
 %build
 autoreconf -v --install
@@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sat Aug 8 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-41.20090528git0c17b87
+- rh#508970: fix for minor corruption at depth 16
+
 * Fri Jun 19 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-40.20090528git0c17b87
 - correct thinko in pramin vbios patch