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

[Chris Wilson]

 src/sna/sna_accel.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fab3bc70a450d94104c96ddbe7fa6e6ace1bb8f8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 30 11:05:33 2014 +0100

    sna: Reduce assertion when using asynchronous CPU access
    
    If we are not actually accessing the memory through the pointer, we do
    not care if it not currently coherent.
    
    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 fab0637..2f723eb 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1524,6 +1524,11 @@ static inline bool has_coherent_ptr(struct sna *sna, struct sna_pixmap *priv, un
 	if (priv == NULL)
 		return true;
 
+	if (flags & MOVE_ASYNC_HINT) {
+		/* Not referencing the pointer itself, so do not care */
+		return true;
+	}
+
 	if (!priv->mapped) {
 		if (!priv->cpu_bo)
 			return true;
@@ -3065,7 +3070,7 @@ skip:
 	assert(pixmap->devPrivate.ptr == PTR(priv->ptr));
 	assert(pixmap->devKind);
 	assert_pixmap_damage(pixmap);
-	assert(has_coherent_ptr(sna, sna_pixmap(pixmap), flags));
+	assert(has_coherent_ptr(sna, priv, flags));
 	return true;
 }