rpms/xorg-x11-drv-nouveau/devel nouveau-bicubic-2x.patch, 1.13, 1.14 nouveau-multiple-xserver.patch, 1.15, 1.16 nouveau-tile7000.patch, 1.3, 1.4 xorg-x11-drv-nouveau.spec, 1.58, 1.59

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	nouveau-bicubic-2x.patch nouveau-multiple-xserver.patch 
	nouveau-tile7000.patch xorg-x11-drv-nouveau.spec 
Log Message:
* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-11.20090921gitdf95ebd
- fix an accel pitch issue seen in rh#523281



nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nouveau-bicubic-2x.patch	14 Sep 2009 06:12:15 -0000	1.13
+++ nouveau-bicubic-2x.patch	21 Sep 2009 05:11:29 -0000	1.14
@@ -1,4 +1,4 @@
-From 36281908ca3785b8fb50907b892ff49970c6f2c7 Mon Sep 17 00:00:00 2001
+From 25777010799a8eccde5bf00c61bc2685753db80f Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.4.2
+1.6.4.4
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nouveau-multiple-xserver.patch	14 Sep 2009 06:12:15 -0000	1.15
+++ nouveau-multiple-xserver.patch	21 Sep 2009 05:11:29 -0000	1.16
@@ -1,4 +1,4 @@
-From 9a882ef6e1e0112112ac9819632bd320f1f34c1a Mon Sep 17 00:00:00 2001
+From 38c897a1cbc4cd809f8c250a41a03299ec6d08c9 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -153,5 +153,5 @@ index 9317b5e..37a8da7 100644
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
 -- 
-1.6.4.2
+1.6.4.4
 

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nouveau-tile7000.patch	14 Sep 2009 06:12:15 -0000	1.3
+++ nouveau-tile7000.patch	21 Sep 2009 05:11:30 -0000	1.4
@@ -1,4 +1,4 @@
-From 44148dd51aa13876490063ce4e89ae94b6d9b604 Mon Sep 17 00:00:00 2001
+From f59c4dfa92909d43e1512dfaa4a23a3e7e37ed68 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] f12: use 0x7000 fla
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index e152e7f..455c44f 100644
+index 82b86c4..1157221 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -442,7 +442,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -443,7 +443,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50) {
  		tile_mode = 4;
@@ -22,7 +22,7 @@ index e152e7f..455c44f 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1063,7 +1063,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1064,7 +1064,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;
@@ -64,7 +64,7 @@ index 37a8da7..b2a24d7 100644
  	} else {
  		size *= pScrn->virtualY;
 diff --git a/src/nv_type.h b/src/nv_type.h
-index 285392d..089b090 100644
+index 68c415f..e24f30c 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
 @@ -113,6 +113,8 @@ typedef struct _NVRec {
@@ -77,5 +77,5 @@ index 285392d..089b090 100644
      struct nouveau_bo * scanout;
      struct nouveau_bo * offscreen;
 -- 
-1.6.4.2
+1.6.4.4
 


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xorg-x11-drv-nouveau.spec	14 Sep 2009 06:12:15 -0000	1.58
+++ xorg-x11-drv-nouveau.spec	21 Sep 2009 05:11:30 -0000	1.59
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090914
-%define git_version 1b72020
+%define gitdate 20090921
+%define git_version df94ebd
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -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:   10.%{snapshot}%{?dist}
+Release:   11.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-11.20090921gitdf95ebd
+- fix an accel pitch issue seen in rh#523281
+
 * Mon Sep 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-10.20090914git1b72020
 - wait for fbcon copy to complete before switching mode (rh#522688)