xserver-xorg-video-nouveau: Changes to 'upstream-experimental'

[Sven Joachim <joachim-guest@alioth.debian.org>]

 src/nv50_exa.c |    2 +-
 src/nvc0_exa.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8378443bd3b26b57ef2ae424a700e01ead813d33
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Thu Mar 24 02:13:12 2011 +1000

    nv50-nvc0/exa: fix bug causing surface state to not be reemitted after flush
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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);
 }
 
diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c
index 85cb5d2..9833275 100644
--- a/src/nvc0_exa.c
+++ b/src/nvc0_exa.c
@@ -541,7 +541,7 @@ NVC0EXAStateSIFCResubmit(struct nouveau_channel *chan)
 	if (MARK_RING(pNv->chan, 32, 2))
 		return;
 
-	if (NVC0EXAAcquireSurface2D(pNv->pdpix, 0))
+	if (!NVC0EXAAcquireSurface2D(pNv->pdpix, 0))
 		MARK_UNDO(pNv->chan);
 }