[xorg-x11-drv-nouveau/f14/master] nv50 sifc surface state

[Ben Skeggs]

commit 347674ff41c5bde2e0d6a154299bb156317ab7ec
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Mon Apr 11 09:29:37 2011 +1000

    nv50 sifc surface state

 nouveau-nv50-sifc-fix.patch |   27 +++++++++++++++++++++++++++
 xorg-x11-drv-nouveau.spec   |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/nouveau-nv50-sifc-fix.patch b/nouveau-nv50-sifc-fix.patch
new file mode 100644
index 0000000..1b78b57
--- /dev/null
+++ b/nouveau-nv50-sifc-fix.patch
@@ -0,0 +1,27 @@
+From 8378443bd3b26b57ef2ae424a700e01ead813d33 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs at redhat.com>
+Date: Thu, 24 Mar 2011 02:13:12 +1000
+Subject: [PATCH] nv50-nvc0/exa: fix bug causing surface state to not be reemitted after flush
+
+Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
+---
+ src/nv50_exa.c |    2 +-
+ src/nvc0_exa.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nv50_exa.c b/src/nv50_exa.c
+index 85baa68..b6094ae 100644
+--- a/src/nv50_exa.c
++++ b/src/nv50_exa.c
+@@ -363,7 +363,7 @@ NV50EXAStateSIFCResubmit(struct nouveau_channel *chan)
+ 	if (MARK_RING(pNv->chan, 32, 2))
+ 		return;
+ 
+-	if (NV50EXAAcquireSurface2D(pNv->pdpix, 0))
++	if (!NV50EXAAcquireSurface2D(pNv->pdpix, 0))
+ 		MARK_UNDO(pNv->chan);
+ }
+ 
+-- 
+1.7.4.2
+
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 3c4ec8a..b2f89ae 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -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
@@ -46,6 +46,7 @@ Patch0: nouveau-bgnr.patch
 Patch1: nouveau-nva0-corruption-fix.patch
 Patch2: nouveau-zfill-fallback.patch
 Patch3: nouveau-nva3-noaccel-info.patch
+Patch4: nouveau-nv50-sifc-fix.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -57,6 +58,7 @@ X.Org X11 nouveau video driver.
 %patch1 -p1 -b .tile7000
 %patch2 -p1 -b .zfill
 %patch3 -p1 -b .nva3-info
+%patch4 -p1 -b .nv50-sifc
 
 %build
 autoreconf -v --install
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Apr 11 2011 Ben Skeggs <bskeggs at redhat.com> 0.0.16-14.20101010git8c8f15c
+- nv50: add fix to reemit surface state on flush during SIFC
+
 * 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