summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-07-04 09:48:53 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-07-04 09:48:53 +0100
commit4e12d5ca26bdfafd7b9cd02c36e6d991f068f29b (patch)
tree97216f68f169235566847d11b15d6c3315cdb3fc
parent18ae7722dbdf6ab61560962ed6ca8d39f353b1f9 (diff)
downloadxorg-driver-xf86-video-intel-4e12d5ca26bdfafd7b9cd02c36e6d991f068f29b.tar.gz
sna: Prevent creating a GPU bo for an inplace read
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index e317e652..c58f1776 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2054,7 +2054,7 @@ static inline bool operate_inplace(struct sna_pixmap *priv, unsigned flags)
return false;
}
- if (priv->cpu_damage && flags & MOVE_READ) {
+ if ((priv->gpu_damage == NULL || priv->cpu_damage) && flags & MOVE_READ) {
DBG(("%s: no, has CPU damage and requires readback\n", __FUNCTION__));
return false;
}