rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.36, 1.37 nouveau-bicubic-2x.patch, 1.2, 1.3 nouveau-multiple-xserver.patch, 1.5, 1.6 nouveau-transition-hack.patch, 1.5, 1.6 sources, 1.37, 1.38 xorg-x11-drv-nouveau.spec, 1.46, 1.47 nouveau-fb-resize.patch, 1.4, NONE nouveau-nv50-fb-accel.patch, 1.5, NONE

Ben Skeggs bskeggs at fedoraproject.org
Tue Jul 28 15:32:18 UTC 2009 

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Removed Files:
	nouveau-fb-resize.patch nouveau-nv50-fb-accel.patch 
Log Message:
* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-0.20090728git4d20547
- Update to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	16 Jul 2009 22:37:51 -0000	1.36
+++ .cvsignore	28 Jul 2009 15:32:17 -0000	1.37
@@ -1 +1 @@
-xf86-video-nouveau-0.0.14-20090717gitb1b2330.tar.bz2
+xf86-video-nouveau-0.0.15-20090728git4d20547.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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nouveau-bicubic-2x.patch	16 Jul 2009 22:58:07 -0000	1.2
+++ nouveau-bicubic-2x.patch	28 Jul 2009 15:32:17 -0000	1.3
@@ -1,7 +1,7 @@
-From 106c7cbafe6d879fd3c244f174e661680c9d109a Mon Sep 17 00:00:00 2001
+From a44a045c47750b16c7e202b7a337b1b6e24ff859 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 5/5] xv: only use bicubic filtering when scaling >=2x
+Subject: [PATCH 3/3] xv: only use bicubic filtering when scaling >=2x
 
 ---
  src/nv30_xv_tex.c |    2 +-
@@ -9,7 +9,7 @@ Subject: [PATCH 5/5] xv: only use bicubi
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
-index 96796fa..adb9010 100644
+index cd76279..25cae64 100644
 --- a/src/nv30_xv_tex.c
 +++ b/src/nv30_xv_tex.c
 @@ -324,7 +324,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
@@ -22,10 +22,10 @@ index 96796fa..adb9010 100644
  	else
  		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
-index 46a7c3d..417dfb7 100644
+index 3d1f146..e0efb41 100644
 --- a/src/nv40_xv_tex.c
 +++ b/src/nv40_xv_tex.c
-@@ -300,7 +300,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
+@@ -299,7 +299,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
  	NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2);
  
  	NV40_LoadVtxProg(pScrn, &nv40_vp_video);
@@ -35,5 +35,5 @@ index 46a7c3d..417dfb7 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.2.5
+1.6.3.3
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   98 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 27 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-multiple-xserver.patch	16 Jul 2009 22:58:07 -0000	1.5
+++ nouveau-multiple-xserver.patch	28 Jul 2009 15:32:18 -0000	1.6
@@ -1,14 +1,14 @@
-From 5b4e7d23eebb0731d5103196c2620b866b5acdb1 Mon Sep 17 00:00:00 2001
+From 7c58a69d5f6d86d1170170e8154fa7bbe9226c2c 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/5] f12: hack to support multiple xserver instances
+Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
 
 ---
- src/nv_driver.c |  104 ++++++++++++++++++++++++++++++++++++++++--------------
- 1 files changed, 77 insertions(+), 27 deletions(-)
+ src/nv_driver.c |   97 ++++++++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 71 insertions(+), 26 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index fda0042..5e80154 100644
+index 838fc67..35233dc 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index fda0042..5e80154 100644
  
  #include "nv_include.h"
  
-@@ -378,14 +379,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -377,14 +378,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
   */
  
  /* Mandatory */
@@ -61,8 +61,8 @@ index fda0042..5e80154 100644
  	if (!pNv->kms_enable) {
  		if (pNv->Architecture < NV_ARCH_50)
  			NVRestore(pScrn);
-@@ -1168,6 +1189,58 @@ NVMapMemSW(ScrnInfoPtr pScrn)
- }
+@@ -1114,6 +1135,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ 
  
  static Bool
 +NVMapMemSharedFB(ScrnInfoPtr pScrn)
@@ -75,16 +75,10 @@ index fda0042..5e80154 100644
 +	if (ret)
 +		return FALSE;
 +
-+	ret = nouveau_bo_wrap(pNv->dev, handle, &pNv->FB);
++	ret = nouveau_bo_wrap(pNv->dev, handle, &pNv->offscreen);
 +	if (ret)
 +		return FALSE;
 +
-+	ret = nouveau_bo_pin(pNv->FB, NOUVEAU_BO_VRAM);
-+	if (ret) {
-+		nouveau_bo_ref(NULL, &pNv->FB);
-+		return FALSE;
-+	}
-+
 +	return TRUE;
 +}
 +
@@ -109,8 +103,8 @@ index fda0042..5e80154 100644
 +			   size >> 10);
 +	}
 +
-+	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN |
-+			   NOUVEAU_BO_MAP, 0, size, &pNv->GART)) {
++	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
++			   0, size, &pNv->GART)) {
 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 +			   "Unable to allocate GART memory\n");
 +	}
@@ -120,25 +114,27 @@ index fda0042..5e80154 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1198,6 +1271,8 @@ NVMapMem(ScrnInfoPtr pScrn)
- 		size = size * (pScrn->bitsPerPixel >> 3);
- 		size = size * height;
- 	} else {
+@@ -1150,6 +1217,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+ 	nouveau_bo_unmap(pNv->scanout);
+ 
+ 	if (!pNv->exa_driver_pixmaps) {
 +		if (NVMapMemSharedFB(pScrn))
 +			goto skip_fb;
- 		size = pNv->VRAMPhysicalSize / 2;
- 	}
- 
-@@ -1208,38 +1283,13 @@ NVMapMem(ScrnInfoPtr pScrn)
- 			   "Failed to allocate framebuffer memory\n");
- 		return FALSE;
- 	}
 +
+ 		size = (pNv->VRAMPhysicalSize / 2) - size;
+ 
+ 		if (pNv->Architecture >= NV_ARCH_50) {
+@@ -1166,6 +1236,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+ 			return FALSE;
+ 		}
+ 
 +skip_fb:
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		   "Allocated %dMiB VRAM for framebuffer + offscreen pixmaps, "
- 		   "at offset 0x%X\n",
- 		   (uint32_t)(pNv->FB->size >> 20), (uint32_t) pNv->FB->offset);
+ 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 			   "Allocated %dMiB VRAM for offscreen pixmaps\n",
+ 			   (uint32_t)(pNv->offscreen->size >> 20));
+@@ -1175,32 +1246,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+ 		nouveau_bo_unmap(pNv->offscreen);
+ 	}
  
 -	if (pNv->AGPSize) {
 -		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -152,12 +148,11 @@ index fda0042..5e80154 100644
 -	} else {
 -		size = (4 << 20) - (1 << 18) ;
 -		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--			   "GART: PCI DMA - using %dKiB\n",
--			   size >> 10);
+-			   "GART: PCI DMA - using %dKiB\n", size >> 10);
 -	}
 -
--	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN |
--			   NOUVEAU_BO_MAP, 0, size, &pNv->GART)) {
+-	if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
+-			   0, size, &pNv->GART)) {
 -		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 -			   "Unable to allocate GART memory\n");
 -	}
@@ -171,5 +166,5 @@ index fda0042..5e80154 100644
  	 * kernel modesetting
  	 **/
 -- 
-1.6.2.5
+1.6.3.3
 

nouveau-transition-hack.patch:
 drmmode_display.c |  148 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 145 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-transition-hack.patch	16 Jul 2009 22:58:08 -0000	1.5
+++ nouveau-transition-hack.patch	28 Jul 2009 15:32:18 -0000	1.6
@@ -1,17 +1,17 @@
-From 2c7d72e602efce6c6fae11c93da173c7beee5eea Mon Sep 17 00:00:00 2001
+From 459ea50ee1a538b7203d01e071fa481f297c2416 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/5] f12: transitions
+Subject: [PATCH 2/3] f12: transitions
 
 ---
  src/drmmode_display.c |  147 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 files changed, 145 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 1f67dd7..f68e0eb 100644
+index 21ed564..901be50 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -171,6 +171,142 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -172,6 +172,142 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -45,8 +45,8 @@ index 1f67dd7..f68e0eb 100644
 +	}
 +	src = src_bo->map;
 +
-+	nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
-+	dst = pNv->FB->map;
++	nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
++	dst = pNv->scanout->map;
 +	dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
 +
 +	h = fb->height;
@@ -56,7 +56,7 @@ index 1f67dd7..f68e0eb 100644
 +		dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
 +	}
 +
-+	nouveau_bo_unmap(pNv->FB);
++	nouveau_bo_unmap(pNv->scanout);
 +	nouveau_bo_unmap(src_bo);
 +	nouveau_bo_ref(NULL, &src_bo);
 +	drmFree(fb);
@@ -99,7 +99,7 @@ index 1f67dd7..f68e0eb 100644
 +		return;
 +	}
 +
-+	nouveau_bo_ref(pNv->FB, &dst);
++	nouveau_bo_ref(pNv->scanout, &dst);
 +
 +	BEGIN_RING(chan, eng2d, 0x02ac, 1);
 +	OUT_RING  (chan, 3);
@@ -154,7 +154,7 @@ index 1f67dd7..f68e0eb 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -183,6 +319,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -184,6 +320,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -169,7 +169,7 @@ index 1f67dd7..f68e0eb 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -283,8 +427,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -285,8 +429,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else
@@ -180,5 +180,5 @@ index 1f67dd7..f68e0eb 100644
  				drmmode_crtc->mode_crtc->buffer_id, x, y);
  	}
 -- 
-1.6.2.5
+1.6.3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	16 Jul 2009 22:37:51 -0000	1.37
+++ sources	28 Jul 2009 15:32:18 -0000	1.38
@@ -1 +1 @@
-c659ae86325218d9bcd9d1a6828fd77c  xf86-video-nouveau-0.0.14-20090717gitb1b2330.tar.bz2
+b37bfc0e2b040b16efaf9f00431d556a  xf86-video-nouveau-0.0.15-20090728git4d20547.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.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- xorg-x11-drv-nouveau.spec	27 Jul 2009 08:28:51 -0000	1.46
+++ xorg-x11-drv-nouveau.spec	28 Jul 2009 15:32:18 -0000	1.47
@@ -1,14 +1,14 @@
 %define tarball xf86-video-nouveau
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
-%define nouveau_version 0.0.14
+%define nouveau_version 0.0.15
 
 # Tarfile created using git
 # 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 20090717
-%define git_version b1b2330
+%define gitdate 20090728
+%define git_version 4d20547
 
 %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:   4.%{snapshot}%{?dist}
+Release:   0.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -32,21 +32,19 @@ ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-devel >= 1.6.99
-BuildRequires: libdrm-devel >= 2.4.12-0.1
+BuildRequires: libdrm-devel >= 2.4.12-0.4
 BuildRequires: mesa-libGL-devel
 BuildRequires: kernel-headers >= 2.6.31
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.6.99
-Requires:  libdrm >= 2.4.12-0.1
-Requires:  kernel-drm-nouveau = 14
+Requires:  libdrm >= 2.4.12-0.4
+Requires:  kernel-drm-nouveau = 15
 
 Patch0: nouveau-store-vbios.patch
 Patch1: dcbconf_7_4_ignore.diff
 Patch2: nouveau-multiple-xserver.patch
 Patch3: nouveau-transition-hack.patch
-Patch4: nouveau-nv50-fb-accel.patch
-Patch5: nouveau-fb-resize.patch
 Patch6: nouveau-bicubic-2x.patch
 
 %description 
@@ -59,8 +57,6 @@ X.Org X11 nouveau video driver.
 %patch1 -p1 -b .dcbconf
 %patch2 -p1 -b .multix
 %patch3 -p1 -b .transition
-%patch4 -p1 -b .nv50fb
-%patch5 -p1 -b .fbresize
 %patch6 -p1 -b .bicubic
 
 %build
@@ -85,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-0.20090728git4d20547
+- Update to latest upstream
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.0.14-4.20090717gitb1b2330
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- nouveau-fb-resize.patch DELETED ---


--- nouveau-nv50-fb-accel.patch DELETED ---

More information about the scm-commits mailing list