rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.44, 1.45 nouveau-bicubic-2x.patch, 1.12, 1.13 nouveau-multiple-xserver.patch, 1.14, 1.15 nouveau-tile7000.patch, 1.2, 1.3 sources, 1.45, 1.46 xorg-x11-drv-nouveau.spec, 1.57, 1.58

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* 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)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	10 Sep 2009 05:37:03 -0000	1.44
+++ .cvsignore	14 Sep 2009 06:12:15 -0000	1.45
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2
+xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2

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.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nouveau-bicubic-2x.patch	10 Sep 2009 05:37:03 -0000	1.12
+++ nouveau-bicubic-2x.patch	14 Sep 2009 06:12:15 -0000	1.13
@@ -1,4 +1,4 @@
-From 4c5b7cde89e9411aa5b107be48ce164837b05881 Mon Sep 17 00:00:00 2001
+From 36281908ca3785b8fb50907b892ff49970c6f2c7 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

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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nouveau-multiple-xserver.patch	10 Sep 2009 05:37:03 -0000	1.14
+++ nouveau-multiple-xserver.patch	14 Sep 2009 06:12:15 -0000	1.15
@@ -1,4 +1,4 @@
-From 2c643c98ae006460c0a3fdb5f9660bd3ea9a4fce Mon Sep 17 00:00:00 2001
+From 9a882ef6e1e0112112ac9819632bd320f1f34c1a 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

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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nouveau-tile7000.patch	10 Sep 2009 05:37:03 -0000	1.2
+++ nouveau-tile7000.patch	14 Sep 2009 06:12:15 -0000	1.3
@@ -1,4 +1,4 @@
-From 2b030e60ff009bf8ee80c4d91d9d92081a711e3d Mon Sep 17 00:00:00 2001
+From 44148dd51aa13876490063ce4e89ae94b6d9b604 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 3010396..a9962ec 100644
+index e152e7f..455c44f 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -436,7 +436,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -442,7 +442,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 3010396..a9962ec 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1057,7 +1057,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1063,7 +1063,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	10 Sep 2009 05:37:03 -0000	1.45
+++ sources	14 Sep 2009 06:12:15 -0000	1.46
@@ -1 +1 @@
-51ba1ce895c4e2b5ce34fe88034b676f  xf86-video-nouveau-0.0.15-20090910git806eaf6.tar.bz2
+cebf1f04b03cf524930bd0f472a5f8b7  xf86-video-nouveau-0.0.15-20090914git1b72020.tar.bz2


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.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- xorg-x11-drv-nouveau.spec	10 Sep 2009 05:37:03 -0000	1.57
+++ xorg-x11-drv-nouveau.spec	14 Sep 2009 06:12:15 -0000	1.58
@@ -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 20090910
-%define git_version 806eaf6
+%define gitdate 20090914
+%define git_version 1b72020
 
 %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:   9.%{snapshot}%{?dist}
+Release:   10.%{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 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-10.20090914git1b72020
+- wait for fbcon copy to complete before switching mode (rh#522688)
+
 * Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
 - fix a hang/crash issue that could occur during a modeset
 - nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway