summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-09-13 19:47:29 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-09-13 19:47:29 +0100
commitdd1432b2c00c94ac75af4740b66b5cd1a573e261 (patch)
tree6380566af7b4203061c587b60a364efbd5ca736b /src
parent8c7dd2219fa777bf6354c4e0ef38a2f09fe09675 (diff)
sna: Do not attempt to change tiling if wedged
The caller will just have to live with the current tiling, which should be fine in most cases, in other cases the gpu is wedged... Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_accel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 5bff247a..7db7368b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -564,6 +564,11 @@ struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling)
return NULL;
}
+ if (wedged(sna)) {
+ DBG(("%s: can't convert bo, wedged\n", __FUNCTION__));
+ return NULL;
+ }
+
assert_pixmap_damage(pixmap);
bo = kgem_create_2d(&sna->kgem,