rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.3, 1.4 nouveau-fb-resize.patch, 1.7, 1.8 nouveau-multiple-xserver.patch, 1.7, 1.8 nouveau-nv50-fb-accel.patch, 1.7, 1.8 nouveau-nv50-nva0-noaccel.patch, 1.7, 1.8 nouveau-store-vbios.patch, 1.7, 1.8 nouveau-transition-hack.patch, 1.7, 1.8 xorg-x11-drv-nouveau.spec, 1.47, 1.48

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	nouveau-bicubic-2x.patch nouveau-fb-resize.patch 
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch xorg-x11-drv-nouveau.spec 
Log Message:
* Thu May 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-36.20090514git9656762
- nv50: fix hang with multiple displays when encoders swap crtcs



nouveau-bicubic-2x.patch:

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-bicubic-2x.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nouveau-bicubic-2x.patch	8 May 2009 01:16:07 -0000	1.3
+++ nouveau-bicubic-2x.patch	14 May 2009 12:53:09 -0000	1.4
@@ -1,4 +1,4 @@
-From b4e52d33ae5ad8942208501490c8d7d017a6a6b5 Mon Sep 17 00:00:00 2001
+From 960fca4b7349b7d0650c4c51fb67ae7317e4a2a3 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 7/7] xv: only use bicubic filtering when scaling >=2x

nouveau-fb-resize.patch:

Index: nouveau-fb-resize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-fb-resize.patch	8 May 2009 01:16:07 -0000	1.7
+++ nouveau-fb-resize.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 832793363e7b3967538c746e21ff1f11eb55dfb5 Mon Sep 17 00:00:00 2001
+From 8a9595d4736cdcbd41dc387e763345227ab83c16 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at caspar.localdomain>
 Date: Tue, 14 Apr 2009 09:23:07 +1000
 Subject: [PATCH 6/7] f11: support framebuffer resize without driver pixmaps
@@ -184,10 +184,10 @@ index cf050f9..adf854b 100644
  	exa->MarkSync = nouveau_exa_mark_sync;
  	exa->WaitMarker = nouveau_exa_wait_marker;
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 61b9e79..278b5a1 100644
+index e66b24a..4c770ee 100644
 --- a/src/nv50_randr.c
 +++ b/src/nv50_randr.c
-@@ -289,8 +289,19 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
+@@ -308,8 +308,19 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
  {
  	ScrnInfoPtr pScrn = crtc->scrn;
  	NV50CrtcPrivatePtr nv_crtc = crtc->driver_private;
@@ -209,7 +209,7 @@ index 61b9e79..278b5a1 100644
  	NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
  }
 diff --git a/src/nv_crtc.c b/src/nv_crtc.c
-index 4ccac45..de1ef42 100644
+index 83d5e40..9bac9de 100644
 --- a/src/nv_crtc.c
 +++ b/src/nv_crtc.c
 @@ -1153,7 +1153,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)

nouveau-multiple-xserver.patch:

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-multiple-xserver.patch	7 May 2009 11:48:45 -0000	1.7
+++ nouveau-multiple-xserver.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 8d6771e5806f6618694449a0d6435631e38924df Mon Sep 17 00:00:00 2001
+From 35e118a76737a196b7dfe0a63683fe94a4b1661e Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:25:25 +1000
 Subject: [PATCH 3/7] f11: hack to support multiple xserver instances

nouveau-nv50-fb-accel.patch:

Index: nouveau-nv50-fb-accel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-nv50-fb-accel.patch	7 May 2009 11:48:45 -0000	1.7
+++ nouveau-nv50-fb-accel.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 6b7c830d4fcdd61a1ee15f61bedf86939d7b0d84 Mon Sep 17 00:00:00 2001
+From 3a9b44986234c62e11dc225e4e5ae05e1487c79c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:30:38 +1000
 Subject: [PATCH 4/7] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -156,10 +156,10 @@ index 949f747..cf050f9 100644
  	exa->WaitMarker = nouveau_exa_wait_marker;
  
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 3459f05..61b9e79 100644
+index a261a3b..e66b24a 100644
 --- a/src/nv50_randr.c
 +++ b/src/nv50_randr.c
-@@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
+@@ -117,7 +117,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
  		nv_crtc->crtc->SetFB(nv_crtc->crtc, nv_crtc->shadow);
  		nv_crtc->crtc->SetFBOffset(nv_crtc->crtc, 0, 0);
  	} else {

nouveau-nv50-nva0-noaccel.patch:

Index: nouveau-nv50-nva0-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-nv50-nva0-noaccel.patch	7 May 2009 11:48:45 -0000	1.7
+++ nouveau-nv50-nva0-noaccel.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 44db9b3b2b4834e5a40c2bc52d9fbb4329cef23a Mon Sep 17 00:00:00 2001
+From 36f1dc154cbcc9f6f247f2fd6de8706802f82194 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 20:20:39 +1000
 Subject: [PATCH 5/7] nv50/f11: disable acceleration on NVAx chipsets

nouveau-store-vbios.patch:

Index: nouveau-store-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-store-vbios.patch	7 May 2009 11:48:45 -0000	1.7
+++ nouveau-store-vbios.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 3084a152e559851c417f3eedcdec32c054b3bec5 Mon Sep 17 00:00:00 2001
+From 3f4763af5a48077e2b98888ab8d3383933128697 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:13:26 +1000
 Subject: [PATCH 2/7] bios/f11: store a copy of used vbios image in /var/run

nouveau-transition-hack.patch:

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-transition-hack.patch	7 May 2009 11:48:45 -0000	1.7
+++ nouveau-transition-hack.patch	14 May 2009 12:53:09 -0000	1.8
@@ -1,4 +1,4 @@
-From 3176abc8829a073d934c0e861ca6a04938c35d5f Mon Sep 17 00:00:00 2001
+From 14ab3035714b46221c57339ec760f373dab8cc7a Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:12:25 +1000
 Subject: [PATCH 1/7] kms/f11: hack in transition support without driver pixmaps


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.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xorg-x11-drv-nouveau.spec	8 May 2009 01:16:07 -0000	1.47
+++ xorg-x11-drv-nouveau.spec	14 May 2009 12:53:09 -0000	1.48
@@ -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 20090507
-%define git_version 1072103
+%define gitdate 20090514
+%define git_version 9656762
 
 %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:   35.%{snapshot}%{?dist}
+Release:   36.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu May 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-36.20090514git9656762
+- nv50: fix hang with multiple displays when encoders swap crtcs
+
 * Fri May 08 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-35.20090507git1072103
 - nv50: ensure crtcs get reprogrammed as needed across resize