[xorg-x11-drv-nouveau/f15/master] nv50/nvc0 corruption fix

Ben Skeggs bskeggs at fedoraproject.org
Wed Mar 23 06:27:16 UTC 2011


commit df496845625474c87706c65c9cbdae7f9885f247
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Wed Mar 23 16:23:44 2011 +1000

    nv50/nvc0 corruption fix

 .gitignore                      |    1 +
 nouveau-nva3-noaccel-info.patch |    4 ++--
 sources                         |    2 +-
 xorg-x11-drv-nouveau.spec       |    9 ++++++---
 4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b7e020..4e0d385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
 /xf86-video-nouveau-0.0.16-20110216git42c16ff.tar.bz2
 /xf86-video-nouveau-0.0.16-20110224gitbc5dec2.tar.bz2
 /xf86-video-nouveau-0.0.16-20110303git92db2bc.tar.bz2
+/xf86-video-nouveau-0.0.16-20110324git8378443.tar.bz2
diff --git a/nouveau-nva3-noaccel-info.patch b/nouveau-nva3-noaccel-info.patch
index 78db970..ddd6586 100644
--- a/nouveau-nva3-noaccel-info.patch
+++ b/nouveau-nva3-noaccel-info.patch
@@ -1,4 +1,4 @@
-From 4b0e830d08d0c133fc1eaaf49404ec10d87b3ced Mon Sep 17 00:00:00 2001
+From 97d0bd96c536349f21f6b6bc1f148f7ba58f2990 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] nva3-noaccel-info
@@ -36,5 +36,5 @@ index 49ed40a..2d837ea 100644
  	}
  	pNv->chan->user_private = pScrn;
 -- 
-1.7.4
+1.7.4.1
 
diff --git a/sources b/sources
index 004fa4c..e0474ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae8521492984dc6559bd29eae9775689  xf86-video-nouveau-0.0.16-20110303git92db2bc.tar.bz2
+1d6d7bfa9a8039a22f64f69ae24ca93f  xf86-video-nouveau-0.0.16-20110324git8378443.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index cef1352..1f59fa9 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 20110303
-%define git_version 92db2bc
+%define gitdate 20110324
+%define git_version 8378443
 
 %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:   23.%{snapshot}%{?dist}
+Release:   24.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Mar 23 2011 Ben Skeggs <bskeggs at redhat.com> - 0.0.16-24.20110324git8378443
+- nv50-nvc0/exa: fix bug exposed by 2.6.38 kernel
+
 * Thu Mar 10 2011 Adam Jackson <ajax at redhat.com> - 1:0.0.16-23.20110303git92db2bc
 - xserver 1.10 ABI rebuild
 


More information about the scm-commits mailing list