[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



 ChangeLog        |    8 ++++++++
 debian/changelog |    2 +-
 src/nv50_exa.c   |    2 +-
 src/nvc0_exa.c   |    2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 2b235d9f2b6d56704b1cf4d619e4990ef26f0829
Author: Sven Joachim <svenjoac@gmx.de>
Date:   Mon Apr 11 16:45:35 2011 +0200

    New upstream snapshot

diff --git a/ChangeLog b/ChangeLog
index 416cf5a..8adf9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>
+
 commit 92db2bc192a074d4b7fc3e9c16e9aa62a8deaeb6
 Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
 Date:   Thu Mar 3 22:17:23 2011 +0100
diff --git a/debian/changelog b/debian/changelog
index 6dc3d6c..74b9851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:0.0.16+git20110411+8378443-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
     - Fixes sluggish rendering of X core fonts (Closes: #614938).

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);
 }
 


Reply to: