xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b584162e387187a7cdb7f46a3a151e00e7d3de58
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 7 16:32:40 2013 +0100

    sna: Set the needs_flush flag on the bo when the scanout is dirty
    
    Since the call to the busy_ioctl is predicated on whether the bo needs
    to be flushed by us, therefore when forcing the call to the busy_ioctl
    to flush the GTT we need to mark it as requiring needs_flush.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1b16bc5..bf5832b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -14199,8 +14199,10 @@ static bool start_flush(struct sna *sna, struct sna_pixmap *scanout)
 	if (!scanout)
 		return false;
 
-	if (sna->flags & SNA_FLUSH_GTT && scanout->gtt_dirty)
+	if (sna->flags & SNA_FLUSH_GTT && scanout->gtt_dirty) {
+		scanout->gpu_bo->needs_flush = true;
 		return true;
+	}
 
 	return scanout->cpu_damage || scanout->gpu_bo->exec;
 }
@@ -14223,8 +14225,10 @@ static bool stop_flush(struct sna *sna, struct sna_pixmap *scanout)
 	if (!scanout)
 		return false;
 
-	if (sna->flags & SNA_FLUSH_GTT && scanout->gtt_dirty)
+	if (sna->flags & SNA_FLUSH_GTT && scanout->gtt_dirty) {
+		scanout->gpu_bo->needs_flush = true;
 		return true;
+	}
 
 	return scanout->cpu_damage || scanout->gpu_bo->needs_flush;
 }