rpms/xorg-x11-drv-nouveau/F-12 .cvsignore, 1.48, 1.49 nouveau-bicubic-2x.patch, 1.16, 1.17 nouveau-multiple-xserver.patch, 1.18, 1.19 nouveau-tile7000.patch, 1.6, 1.7 sources, 1.49, 1.50 xorg-x11-drv-nouveau.spec, 1.61, 1.62
Ben Skeggs
bskeggs at fedoraproject.org
Thu Oct 8 06:29:04 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14089
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-tile7000.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091008git3f020b0
- update from upstream, fixes various issues, especially with recent xservers
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore 29 Sep 2009 01:38:15 -0000 1.48
+++ .cvsignore 8 Oct 2009 06:29:02 -0000 1.49
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+xf86-video-nouveau-0.0.15-20091008git3f020b0.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/F-12/nouveau-bicubic-2x.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nouveau-bicubic-2x.patch 29 Sep 2009 01:38:15 -0000 1.16
+++ nouveau-bicubic-2x.patch 8 Oct 2009 06:29:02 -0000 1.17
@@ -1,4 +1,4 @@
-From 0c60f12c250e244d5d6a245c0df3b941a176aa59 Mon Sep 17 00:00:00 2001
+From a3be167495bdf7149c2a16ee5ad87e532e27191c 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
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
else
NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
--
-1.6.4.4
+1.6.5.rc2
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/F-12/nouveau-multiple-xserver.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nouveau-multiple-xserver.patch 29 Sep 2009 01:38:15 -0000 1.18
+++ nouveau-multiple-xserver.patch 8 Oct 2009 06:29:02 -0000 1.19
@@ -1,4 +1,4 @@
-From e81556ab7611efd9977f16a00ee09a194eb5bce1 Mon Sep 17 00:00:00 2001
+From 29f3ff4f95c58a0632d5c7a927d8348917c83e23 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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] f12: hack to suppor
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 879d971..e57a696 100644
+index 7763faa..53d8a63 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -153,5 +153,5 @@ index 879d971..e57a696 100644
/* We don't need to allocate cursors / lut here if we're using
* kernel modesetting
--
-1.6.4.4
+1.6.5.rc2
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/F-12/nouveau-tile7000.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-tile7000.patch 29 Sep 2009 01:38:15 -0000 1.6
+++ nouveau-tile7000.patch 8 Oct 2009 06:29:02 -0000 1.7
@@ -1,4 +1,4 @@
-From 682b24f8d6fb5053ed8b89cacaaca4dd25c03a16 Mon Sep 17 00:00:00 2001
+From 245b7bc4920a485b9e3ebe6e7e0dc9bf40da4744 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 82b86c4..1157221 100644
+index 3930814..5fbec9b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -443,7 +443,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -460,7 +460,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 82b86c4..1157221 100644
ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
} else {
-@@ -1064,7 +1064,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1067,7 +1067,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
tile_mode = 4;
@@ -32,7 +32,7 @@ index 82b86c4..1157221 100644
pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index e57a696..e0c1c10 100644
+index 53d8a63..c06679b 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
@@ -77,5 +77,5 @@ index ddf121c..6e1f2f3 100644
struct nouveau_bo * scanout;
struct nouveau_bo * offscreen;
--
-1.6.4.4
+1.6.5.rc2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources 29 Sep 2009 01:38:15 -0000 1.49
+++ sources 8 Oct 2009 06:29:02 -0000 1.50
@@ -1 +1 @@
-e98437442d84c9ca595adc6ae9665eff xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+78ecc78f09904532960c76c2766aec7e xf86-video-nouveau-0.0.15-20091008git3f020b0.tar.bz2
Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xorg-x11-drv-nouveau.spec 29 Sep 2009 01:38:15 -0000 1.61
+++ xorg-x11-drv-nouveau.spec 8 Oct 2009 06:29:02 -0000 1.62
@@ -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 20090929
-%define git_version dd8339f
+%define gitdate 20091008
+%define git_version 3f020b0
%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: 13.%{snapshot}%{?dist}
+Release: 14.%{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
+* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091008git3f020b0
+- update from upstream, fixes various issues, especially with recent xservers
+
* Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
- fix driver to work again with recent EXA changes
More information about the fedora-extras-commits
mailing list