[xorg-x11-drv-nouveau/f14/master] add info for nva3+ noaccel issue to log, allow wfb to be enabled
Ben Skeggs
bskeggs at fedoraproject.org
Mon Oct 11 00:48:19 UTC 2010
commit c89a19438403db6824ca53be32ad9523b4a9470d
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Mon Oct 11 10:47:11 2010 +1000
add info for nva3+ noaccel issue to log, allow wfb to be enabled
.gitignore | 1 +
nouveau-bgnr.patch | 6 ++--
nouveau-exa-no-pa_fa.patch | 58 -------------------------------------
nouveau-nva0-corruption-fix.patch | 12 ++++----
nouveau-nva3-noaccel-info.patch | 40 +++++++++++++++++++++++++
nouveau-zfill-fallback.patch | 8 ++--
sources | 2 +-
xorg-x11-drv-nouveau.spec | 18 +++++++----
8 files changed, 66 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3cf2a1..00ee66a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
/xf86-video-nouveau-0.0.16-20100820git390f1c8.tar.bz2
/xf86-video-nouveau-0.0.16-20100826git065576d.tar.bz2
/xf86-video-nouveau-0.0.16-20100920gitf1ac413.tar.bz2
+/xf86-video-nouveau-0.0.16-20101010git8c8f15c.tar.bz2
diff --git a/nouveau-bgnr.patch b/nouveau-bgnr.patch
index 2852d4f..a2926d0 100644
--- a/nouveau-bgnr.patch
+++ b/nouveau-bgnr.patch
@@ -1,4 +1,4 @@
-From d6a2ba62e5904e12f7e00101bfe717a33b0e8734 Mon Sep 17 00:00:00 2001
+From f30dd8c3bf79a371c9784e85e02dd0bb01d25a13 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Mon, 8 Feb 2010 12:51:47 +1000
Subject: [PATCH 1/4] set canDoBGNoneRoot
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] set canDoBGNoneRoot
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 8fd1fa4..194dbcd 100644
+index b241ac7..8cf7489 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -672,6 +672,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
@@ -20,5 +20,5 @@ index 8fd1fa4..194dbcd 100644
/*
* The first thing we should figure out is the depth, bpp, etc.
--
-1.7.2.2
+1.7.3.1
diff --git a/nouveau-nva0-corruption-fix.patch b/nouveau-nva0-corruption-fix.patch
index 08116ec..9d662c7 100644
--- a/nouveau-nva0-corruption-fix.patch
+++ b/nouveau-nva0-corruption-fix.patch
@@ -1,4 +1,4 @@
-From bdacdeebf109f7de8a4394415390439b6c942d6d Mon Sep 17 00:00:00 2001
+From a2ad8bcc980abb347e5133d806de8482438029a8 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Mon, 10 May 2010 08:31:36 +1000
Subject: [PATCH 2/4] force consistant tiling mode to prevent corruption issues
@@ -9,7 +9,7 @@ Subject: [PATCH 2/4] force consistant tiling mode to prevent corruption issues
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 011f4dd..58ffb1d 100644
+index aafe0f6..6df3ec7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -426,7 +426,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
@@ -23,7 +23,7 @@ index 011f4dd..58ffb1d 100644
} else {
@@ -1026,7 +1026,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
- if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
+ if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
tile_mode = 4;
- tile_flags = (scrn->bitsPerPixel == 16) ? 0x7000 : 0x7a00;
+ tile_flags = 0x7000; //(scrn->bitsPerPixel == 16) ? 0x7000 : 0x7a00;
@@ -31,10 +31,10 @@ index 011f4dd..58ffb1d 100644
pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 194dbcd..636b8bb 100644
+index 8cf7489..6dc200f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -860,7 +860,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -863,7 +863,7 @@ NVMapMem(ScrnInfoPtr pScrn)
size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
tile_mode = 4;
@@ -44,5 +44,5 @@ index 194dbcd..636b8bb 100644
} else {
size *= pScrn->virtualY;
--
-1.7.2.2
+1.7.3.1
diff --git a/nouveau-nva3-noaccel-info.patch b/nouveau-nva3-noaccel-info.patch
new file mode 100644
index 0000000..4c67d8d
--- /dev/null
+++ b/nouveau-nva3-noaccel-info.patch
@@ -0,0 +1,40 @@
+From c5ce29cc04087118c14c28418670f58334132d75 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs at redhat.com>
+Date: Mon, 11 Oct 2010 10:35:43 +1000
+Subject: [PATCH 4/4] nva3-noaccel-info
+
+Add info to logs as to likely reason why acceleration isn't available
+on NVA3+ chipsets.
+---
+ src/nv_dma.c | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+diff --git a/src/nv_dma.c b/src/nv_dma.c
+index c3d7639..dfd7e88 100644
+--- a/src/nv_dma.c
++++ b/src/nv_dma.c
+@@ -76,6 +76,21 @@ NVInitDma(ScrnInfoPtr pScrn)
+ if (ret) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Error creating GPU channel: %d\n", ret);
++ switch (pNv->dev->chipset) {
++ case 0xa3:
++ case 0xa5:
++ case 0xa8:
++ case 0xaf:
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "Acceleration disabled by default due to "
++ "unresolved GPU hangs on your chipset.\n");
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "See https://bugzilla.redhat.com/"
++ "show_bug.cgi?id=625187 for more "
++ "information\n");
++ break;
++ }
++
+ return FALSE;
+ }
+ pNv->chan->user_private = pScrn;
+--
+1.7.3.1
+
diff --git a/nouveau-zfill-fallback.patch b/nouveau-zfill-fallback.patch
index 2224c25..142b8f9 100644
--- a/nouveau-zfill-fallback.patch
+++ b/nouveau-zfill-fallback.patch
@@ -1,14 +1,14 @@
-From 8ffcfc0c5f1c79d1813333cf20b4adec1f00bf1a Mon Sep 17 00:00:00 2001
+From ff6af1fc5b4c08064a5dda0ed23f6fbfa5763212 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Mon, 5 Jul 2010 09:15:25 +1000
-Subject: [PATCH 4/4] zfill framebuffer as fallback if fbcon copy fails
+Subject: [PATCH 3/4] zfill framebuffer as fallback if fbcon copy fails
---
src/drmmode_display.c | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 1a38b37..c33fcc7 100644
+index 6df3ec7..300bf68 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -183,13 +183,8 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
@@ -98,5 +98,5 @@ index 1a38b37..c33fcc7 100644
static Bool
--
-1.7.2.2
+1.7.3.1
diff --git a/sources b/sources
index 7e1be04..ed57f3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2454cf061e0c8f53d7a687cef8d6032c xf86-video-nouveau-0.0.16-20100920gitf1ac413.tar.bz2
+372d738309975b6f28e9035b29778ec7 xf86-video-nouveau-0.0.16-20101010git8c8f15c.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index ede9a25..3c4ec8a 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -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 20100920
-%define git_version f1ac413
+%define gitdate 20101010
+%define git_version 8c8f15c
%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: 12.%{snapshot}%{?dist}.1
+Release: 13.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -44,8 +44,8 @@ Requires: libudev
Patch0: nouveau-bgnr.patch
Patch1: nouveau-nva0-corruption-fix.patch
-Patch2: nouveau-exa-no-pa_fa.patch
-Patch3: nouveau-zfill-fallback.patch
+Patch2: nouveau-zfill-fallback.patch
+Patch3: nouveau-nva3-noaccel-info.patch
%description
X.Org X11 nouveau video driver.
@@ -55,8 +55,8 @@ X.Org X11 nouveau video driver.
%patch0 -p1 -b .bgnr
%patch1 -p1 -b .tile7000
-%patch2 -p1 -b .no_wfb
-%patch3 -p1 -b .zfill
+%patch2 -p1 -b .zfill
+%patch3 -p1 -b .nva3-info
%build
autoreconf -v --install
@@ -80,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon Oct 11 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-13.20101010git8c8f15c
+- add extra info to logs for NVA3+ NoAccel issue
+- pull in upstream fixes, and allow wfb to be re-enabled for rhbz#609790
+
* Fri Oct 08 2010 Jesse Keating <jkeating at redhat.com> - 1:0.0.16-12.20100920gitf1ac413.1
- Rebuild for gcc bug 634757
More information about the scm-commits
mailing list