[xorg-x11-drv-nouveau/f14/master] pull from upstream - fixes dri2 race
Ben Skeggs
bskeggs at fedoraproject.org
Tue Aug 31 05:01:38 UTC 2010
commit b7186686f1971adaee4da9bc8dffa926f65fd474
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Tue Aug 31 15:01:07 2010 +1000
pull from upstream - fixes dri2 race
.gitignore | 1 +
nouveau-bgnr.patch | 8 ++++----
nouveau-exa-no-pa_fa.patch | 8 ++++----
nouveau-nva0-corruption-fix.patch | 8 ++++----
nouveau-zfill-fallback.patch | 4 ++--
sources | 2 +-
xorg-x11-drv-nouveau.spec | 9 ++++++---
7 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d46339..82d111a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
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
diff --git a/nouveau-bgnr.patch b/nouveau-bgnr.patch
index 504b53b..6eb97ee 100644
--- a/nouveau-bgnr.patch
+++ b/nouveau-bgnr.patch
@@ -1,4 +1,4 @@
-From 63139f163a361aeb98b649e3c37e63133bf0548b Mon Sep 17 00:00:00 2001
+From 9d9b64b9b58044e2b447e5094359bdfaf3903c01 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,10 +8,10 @@ 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 3c16918..71844ca 100644
+index bd061ed..6ed4742 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -662,6 +662,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -671,6 +671,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -20,5 +20,5 @@ index 3c16918..71844ca 100644
/*
* The first thing we should figure out is the depth, bpp, etc.
--
-1.7.2.1
+1.7.2.2
diff --git a/nouveau-exa-no-pa_fa.patch b/nouveau-exa-no-pa_fa.patch
index f3b4218..a339911 100644
--- a/nouveau-exa-no-pa_fa.patch
+++ b/nouveau-exa-no-pa_fa.patch
@@ -1,4 +1,4 @@
-From 4b6987d2a21a907bc58d570fb8e3f44f6e9dd393 Mon Sep 17 00:00:00 2001
+From 3c65e27305887b4ad7519d5279383bf61d094803 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Mon, 5 Jul 2010 09:14:51 +1000
Subject: [PATCH 3/4] use UTS/DFS rather than libwfb for tiled pixmap access
@@ -41,10 +41,10 @@ index 3b2c9be..3d848b5 100644
return FALSE;
ppix->devPrivate.ptr = bo->map;
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 9a68e3f..c966467 100644
+index 1cd3706..bec35aa 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -766,7 +766,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -775,7 +775,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
}
if (!pNv->NoAccel && pNv->Architecture >= NV_ARCH_50) {
@@ -54,5 +54,5 @@ index 9a68e3f..c966467 100644
}
--
-1.7.2.1
+1.7.2.2
diff --git a/nouveau-nva0-corruption-fix.patch b/nouveau-nva0-corruption-fix.patch
index a232272..3db2119 100644
--- a/nouveau-nva0-corruption-fix.patch
+++ b/nouveau-nva0-corruption-fix.patch
@@ -1,4 +1,4 @@
-From 1eaba4afed4255a7a947fc7b857376118c4652f6 Mon Sep 17 00:00:00 2001
+From 5ac31ff205605b0887940027df6c5267c0a632bb 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
@@ -31,10 +31,10 @@ index 9b5d52d..586b0ac 100644
pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 71844ca..9a68e3f 100644
+index 6ed4742..1cd3706 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -850,7 +850,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -859,7 +859,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 71844ca..9a68e3f 100644
} else {
size *= pScrn->virtualY;
--
-1.7.2.1
+1.7.2.2
diff --git a/nouveau-zfill-fallback.patch b/nouveau-zfill-fallback.patch
index ed9f6fc..3263020 100644
--- a/nouveau-zfill-fallback.patch
+++ b/nouveau-zfill-fallback.patch
@@ -1,4 +1,4 @@
-From c88ced24246a2a96daffe52601221de3ca15ad7c Mon Sep 17 00:00:00 2001
+From 36c4a67c03bae8789dce8379d1319c7ef1dbeb46 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
@@ -98,5 +98,5 @@ index 31912c6..5986a21 100644
static Bool
--
-1.7.2.1
+1.7.2.2
diff --git a/sources b/sources
index 5b8b198..ec37781 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe8c20f4c753a5724ec801bb5f751fbc xf86-video-nouveau-0.0.16-20100820git390f1c8.tar.bz2
+72a686aa28b3c8a6e4f2303c5f4bf145 xf86-video-nouveau-0.0.16-20100826git065576d.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index c861ead..2ba5bd2 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 20100820
-%define git_version 390f1c8
+%define gitdate 20100826
+%define git_version 065576d
%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: 10.%{snapshot}%{?dist}
+Release: 11.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Aug 31 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-11.20100826git065576d
+- fix race with composite managers
+
* Mon Aug 23 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-10.20100820git390f1c8
- minor fixes from upstream
More information about the scm-commits
mailing list