summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-09-23 20:29:21 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-09-23 20:31:19 +0100
commit5ed840881c26e90eb8e00521b6d77b0ea514de5e (patch)
treed7f786bf03bbeb058eeb62859b9d9aebe1bf542a
parenta858afc66c1fa2eec65a7041e991f2266f82deca (diff)
downloadxorg-driver-xf86-video-intel-5ed840881c26e90eb8e00521b6d77b0ea514de5e.tar.gz
sna: Check that the CPU bo exists before declaring it is busy along upload
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55251 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_blt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 6685549a..b5d7ea7f 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1875,7 +1875,7 @@ clear:
put:
priv = sna_pixmap(tmp->dst.pixmap);
- if (tmp->dst.bo == priv->cpu_bo) {
+ if (priv->cpu_bo && tmp->dst.bo == priv->cpu_bo) {
assert(kgem_bo_is_busy(tmp->dst.bo));
tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable,
FORCE_GPU | PREFER_GPU,