rpms/xorg-x11-drv-nouveau/devel nouveau-bicubic-2x.patch, 1.3, 1.4 nouveau-transition-hack.patch, 1.6, 1.7

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	nouveau-bicubic-2x.patch nouveau-transition-hack.patch 
Log Message:
scanout is tiled now, fix protection errors

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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nouveau-bicubic-2x.patch	28 Jul 2009 15:32:17 -0000	1.3
+++ nouveau-bicubic-2x.patch	28 Jul 2009 16:04:07 -0000	1.4
@@ -1,4 +1,4 @@
-From a44a045c47750b16c7e202b7a337b1b6e24ff859 Mon Sep 17 00:00:00 2001
+From d1aaf21efe356bc70d19a46cba3f22f951a4468e 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 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-transition-hack.patch:
 drmmode_display.c |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 147 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-transition-hack.patch	28 Jul 2009 15:32:18 -0000	1.6
+++ nouveau-transition-hack.patch	28 Jul 2009 16:04:07 -0000	1.7
@@ -1,17 +1,17 @@
-From 459ea50ee1a538b7203d01e071fa481f297c2416 Mon Sep 17 00:00:00 2001
+From bf1e465874dbd36b7de3493a69717b292353d648 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
 
 ---
- src/drmmode_display.c |  147 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 145 insertions(+), 2 deletions(-)
+ src/drmmode_display.c |  149 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 147 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 21ed564..901be50 100644
+index 21ed564..ae3c51d 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -172,6 +172,142 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -172,6 +172,144 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -103,11 +103,13 @@ index 21ed564..901be50 100644
 +
 +	BEGIN_RING(chan, eng2d, 0x02ac, 1);
 +	OUT_RING  (chan, 3);
-+	BEGIN_RING(chan, eng2d, 0x0200, 2);
++	BEGIN_RING(chan, eng2d, 0x0200, 5);
 +	OUT_RING  (chan, depth_to_gpu(pScrn->depth));
++	OUT_RING  (chan, 0);
++	OUT_RING  (chan, 0x40);
 +	OUT_RING  (chan, 1);
-+	BEGIN_RING(chan, eng2d, 0x0214, 5);
-+	OUT_RING  (chan, pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
++	OUT_RING  (chan, 0);
++	BEGIN_RING(chan, eng2d, 0x0218, 4);
 +	OUT_RING  (chan, pScrn->virtualX);
 +	OUT_RING  (chan, pScrn->virtualY);
 +	OUT_RELOCh(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
@@ -154,7 +156,7 @@ index 21ed564..901be50 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -184,6 +320,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -184,6 +322,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -169,7 +171,7 @@ index 21ed564..901be50 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -285,8 +429,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -285,8 +431,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else