rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.43, 1.44 nouveau-bicubic-2x.patch, 1.11, 1.12 nouveau-multiple-xserver.patch, 1.13, 1.14 nouveau-tile7000.patch, 1.1, 1.2 sources, 1.44, 1.45 xorg-x11-drv-nouveau.spec, 1.56, 1.57
Ben Skeggs
bskeggs at fedoraproject.org
Thu Sep 10 05:37:03 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15813
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-tile7000.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
- fix a hang/crash issue that could occur during a modeset
- nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore 4 Sep 2009 00:44:52 -0000 1.43
+++ .cvsignore 10 Sep 2009 05:37:03 -0000 1.44
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2
+xf86-video-nouveau-0.0.15-20090910git806eaf6.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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-bicubic-2x.patch 9 Sep 2009 06:38:38 -0000 1.11
+++ nouveau-bicubic-2x.patch 10 Sep 2009 05:37:03 -0000 1.12
@@ -1,7 +1,7 @@
-From 669fc0a22b4c2b6b8c9572187e151e426f039227 Mon Sep 17 00:00:00 2001
+From 4c5b7cde89e9411aa5b107be48ce164837b05881 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/4] xv: only use bicubic filtering when scaling >=2x
+Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x
---
src/nv30_xv_tex.c | 2 +-
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/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nouveau-multiple-xserver.patch 9 Sep 2009 06:38:38 -0000 1.13
+++ nouveau-multiple-xserver.patch 10 Sep 2009 05:37:03 -0000 1.14
@@ -1,14 +1,14 @@
-From bc70e6309b35633b76c48126bb967d4d85bce4df Mon Sep 17 00:00:00 2001
+From 2c643c98ae006460c0a3fdb5f9660bd3ea9a4fce 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/4] f12: hack to support multiple xserver instances
+Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
---
src/nv_driver.c | 84 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index b8de860..5838ce7 100644
+index 9317b5e..37a8da7 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
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/devel/nouveau-tile7000.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nouveau-tile7000.patch 9 Sep 2009 06:38:38 -0000 1.1
+++ nouveau-tile7000.patch 10 Sep 2009 05:37:03 -0000 1.2
@@ -1,7 +1,7 @@
-From 3d2f2ba56b85fde22de2244cb9122708b461b5a7 Mon Sep 17 00:00:00 2001
+From 2b030e60ff009bf8ee80c4d91d9d92081a711e3d 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 4/4] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
+Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
---
src/drmmode_display.c | 4 ++--
@@ -10,10 +10,10 @@ Subject: [PATCH 4/4] f12: use 0x7000 fla
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 266d3a6..6cbced7 100644
+index 3010396..a9962ec 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -604,7 +604,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -436,7 +436,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 266d3a6..6cbced7 100644
ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
} else {
-@@ -1225,7 +1225,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1057,7 +1057,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 266d3a6..6cbced7 100644
pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 5838ce7..a70dee2 100644
+index 37a8da7..b2a24d7 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources 4 Sep 2009 00:44:52 -0000 1.44
+++ sources 10 Sep 2009 05:37:03 -0000 1.45
@@ -1 +1 @@
-50b387dd790cf70326dc3f60fd92310e xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2
+51ba1ce895c4e2b5ce34fe88034b676f xf86-video-nouveau-0.0.15-20090910git806eaf6.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.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- xorg-x11-drv-nouveau.spec 9 Sep 2009 06:38:38 -0000 1.56
+++ xorg-x11-drv-nouveau.spec 10 Sep 2009 05:37:03 -0000 1.57
@@ -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 20090904
-%define git_version 2b5ec6a
+%define gitdate 20090910
+%define git_version 806eaf6
%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: 8.%{snapshot}%{?dist}
+Release: 9.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -44,7 +44,6 @@ 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
Patch6: nouveau-bicubic-2x.patch
Patch7: nouveau-bgnr.patch
Patch8: nouveau-tile7000.patch
@@ -58,7 +57,6 @@ X.Org X11 nouveau video driver.
%patch0 -p1 -b .vbios
%patch1 -p1 -b .dcbconf
%patch2 -p1 -b .multix
-%patch3 -p1 -b .transition
%patch6 -p1 -b .bicubic
%patch7 -p1 -b .bgnr
%patch8 -p1 -b .tile7000
@@ -85,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Thu Sep 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-9.20090910git806eaf6
+- fix a hang/crash issue that could occur during a modeset
+- nouveau-transition-hack.patch: drop, supported with driver pixmaps anyway
+
* Wed Sep 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-8.20090904git2b5ec6a
- nouveau-tile7000.patch: workaround some display corruption on G8x
More information about the fedora-extras-commits
mailing list