rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, NONE, 1.1 nouveau-fb-resize.patch, 1.4, 1.5 nouveau-multiple-xserver.patch, 1.5, 1.6 nouveau-nv50-fb-accel.patch, 1.5, 1.6 nouveau-nv50-nva0-noaccel.patch, 1.5, 1.6 nouveau-store-vbios.patch, 1.5, 1.6 nouveau-transition-hack.patch, 1.5, 1.6 xorg-x11-drv-nouveau.spec, 1.44, 1.45

Mon May 4 07:27:04 UTC 2009

Author: bskeggs

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

Modified Files:
	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 
Added Files:
	nouveau-bicubic-2x.patch 
Log Message:
* Mon May 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-33.20090501gitf69b34a
- rh#492572: only apply bicubic filter when scaling >=2x
- rh#497654: correct exa offscreen memory size


nouveau-bicubic-2x.patch:

--- NEW FILE nouveau-bicubic-2x.patch ---
>From bb5e09ea86f81b11e04995d3db56cf4e82ef878a 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

---
 src/nv30_xv_tex.c |    2 +-
 src/nv40_xv_tex.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
index 32a001c..3414c37 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
@@ -322,7 +322,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
 	BEGIN_RING(chan, rankine, NV34TCL_TX_ENABLE(3), 1);
 	OUT_RING  (chan, 0x0);
 
-	if (pPriv->bicubic)
+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bicubic);
 	else
 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
index c7bbd4e..f69b26e 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
@@ -298,7 +298,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
 	NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2);
 
 	NV40_LoadVtxProg(pScrn, &nv40_vp_video);
-	if (pPriv->bicubic)
+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
 		NV40_LoadFragProg(pScrn, &nv40_fp_yv12_bicubic);
 	else
 		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
-- 
1.6.2.2


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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-fb-resize.patch	1 May 2009 05:58:20 -0000	1.4
+++ nouveau-fb-resize.patch	4 May 2009 07:27:03 -0000	1.5
@@ -1,16 +1,16 @@
-From 61ac455bfcfaf4caa9cac9067f4693c2d56715c7 Mon Sep 17 00:00:00 2001
+From e911cdfa86f6992c9c21b2da589876827a98e03b 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/6] f11: support framebuffer resize without driver pixmaps
+Subject: [PATCH 6/7] f11: support framebuffer resize without driver pixmaps
 
 ---
  src/drmmode_display.c |   75 +++++++++++++++++++++++++++++++--
- src/nouveau_exa.c     |   17 ++++----
+ src/nouveau_exa.c     |   21 +++++-----
  src/nv50_randr.c      |    6 +++
  src/nv_crtc.c         |   16 ++++++-
  src/nv_driver.c       |  108 ++++++++++++++++++++++++++++++++++++++++++++++---
  src/nv_type.h         |    9 ++++-
- 6 files changed, 209 insertions(+), 22 deletions(-)
+ 6 files changed, 210 insertions(+), 25 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
 index ca1a60b..c666c9f 100644
@@ -122,7 +122,7 @@ index ca1a60b..c666c9f 100644
  }
  
 diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index aee2794..41e3f85 100644
+index aee2794..b571443 100644
 --- a/src/nouveau_exa.c
 +++ b/src/nouveau_exa.c
 @@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
@@ -159,7 +159,18 @@ index aee2794..41e3f85 100644
  		return TRUE;
  
  	return FALSE;
-@@ -630,10 +633,8 @@ nouveau_exa_init(ScreenPtr pScreen)
+@@ -587,9 +590,7 @@ nouveau_exa_init(ScreenPtr pScreen)
+ 		nouveau_bo_map(pNv->FB, NOUVEAU_BO_RDWR);
+ 		exa->memoryBase = pNv->FB->map;
+ 		nouveau_bo_unmap(pNv->FB);
+-		exa->offScreenBase = NOUVEAU_ALIGN(pScrn->virtualX, 64) *
+-				     NOUVEAU_ALIGN(pScrn->virtualY, 64) *
+-				     (pScrn->bitsPerPixel / 8);
++		exa->offScreenBase = 0;
+ 		exa->memorySize = pNv->FB->size; 
+ 
+ 		if (pNv->Architecture < NV_ARCH_50) {
+@@ -630,10 +631,8 @@ nouveau_exa_init(ScreenPtr pScreen)
  	}
  
  	/* Needed for frontbuffer fallbacks (to ensure it accesses the linear fb). */

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-multiple-xserver.patch	1 May 2009 05:58:20 -0000	1.5
+++ nouveau-multiple-xserver.patch	4 May 2009 07:27:03 -0000	1.6
@@ -1,7 +1,7 @@
 From 21d8dee1feb667a38296d087aa5ce355b8ce7b17 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/6] f11: hack to support multiple xserver instances
+Subject: [PATCH 3/7] f11: hack to support multiple xserver instances
 
 ---
  src/nv_driver.c |  126 ++++++++++++++++++++++++++++++++++++++++++------------

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-nv50-fb-accel.patch	1 May 2009 05:58:20 -0000	1.5
+++ nouveau-nv50-fb-accel.patch	4 May 2009 07:27:03 -0000	1.6
@@ -1,7 +1,7 @@
 From 376840ad928ea51a5952bd1461b119e24d957b84 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/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
+Subject: [PATCH 4/7] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
 
 ---
  src/Makefile.am          |    1 +

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-nv50-nva0-noaccel.patch	1 May 2009 05:58:20 -0000	1.5
+++ nouveau-nv50-nva0-noaccel.patch	4 May 2009 07:27:03 -0000	1.6
@@ -1,7 +1,7 @@
 From 6ce46f688243aaa010bb18642f32a18e4eeea77a 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/6] nv50/f11: disable acceleration on NVAx chipsets
+Subject: [PATCH 5/7] nv50/f11: disable acceleration on NVAx chipsets
 
 ---
  src/nv_driver.c |    8 ++++++++

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-store-vbios.patch	1 May 2009 05:58:20 -0000	1.5
+++ nouveau-store-vbios.patch	4 May 2009 07:27:03 -0000	1.6
@@ -1,7 +1,7 @@
 From ce581a86984390d77863d91ce4c05886980ee982 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/6] bios/f11: store a copy of used vbios image in /var/run
+Subject: [PATCH 2/7] bios/f11: store a copy of used vbios image in /var/run
 
 ---
  src/nv_bios.c |   13 +++++++++++++

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-transition-hack.patch	1 May 2009 05:58:20 -0000	1.5
+++ nouveau-transition-hack.patch	4 May 2009 07:27:03 -0000	1.6
@@ -1,7 +1,7 @@
 From 76ec695211c0337f96731f85554d3f299e9ef2dc 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/6] kms/f11: hack in transition support without driver pixmaps
+Subject: [PATCH 1/7] kms/f11: hack in transition support without driver pixmaps
 
 ---
  src/drmmode_display.c |  144 ++++++++++++++++++++++++++++++++++++++++++++++++-


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.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xorg-x11-drv-nouveau.spec	1 May 2009 05:58:20 -0000	1.44
+++ xorg-x11-drv-nouveau.spec	4 May 2009 07:27:03 -0000	1.45
@@ -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:   32.%{snapshot}%{?dist}
+Release:   33.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -48,6 +48,7 @@ Patch3: nouveau-nv50-fb-accel.patch
 Patch4: nouveau-nv50-nva0-noaccel.patch
 Patch5: dcbconf_7_4_ignore.diff
 Patch6: nouveau-fb-resize.patch
+Patch7: nouveau-bicubic-2x.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -62,6 +63,7 @@ X.Org X11 nouveau video driver.
 %patch4 -p1 -b .nva0_noaccel
 %patch5 -p1 -b .dcbconf
 %patch6 -p1 -b .fbresize
+%patch7 -p1 -b .bicubic
 
 %build
 autoreconf -v --install
@@ -85,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon May 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-33.20090501gitf69b34a
+- rh#492572: only apply bicubic filter when scaling >=2x
+- rh#497654: correct exa offscreen memory size
+
 * Fri May 01 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-32.20090501gitf69b34a
 - upstream update fixing serious issues in nv50 output setup
 


