summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-06-10 13:25:57 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-06-10 14:39:10 +0100
commitc16b2a125929c9027b62c07d47e9602553153eef (patch)
tree4431b21eca4fa952f2df3135d15d4c32cba67b54
parentfd6aaec33d8ad70544cc02e061c9c5e68cf83414 (diff)
sna: Tidy a few asserts on the state of crtc->flip_bo
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 8e9f7112..ae8658f7 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -6276,19 +6276,19 @@ void sna_mode_wakeup(struct sna *sna)
crtc->swap.tv_usec = vbl->tv_usec;
crtc->swap.msc = msc64(crtc, vbl->sequence);
+ assert(crtc->flip_bo);
+ assert(crtc->flip_bo->active_scanout);
+ assert(crtc->flip_bo->refcnt >= crtc->flip_bo->active_scanout);
+
if (crtc->bo) {
assert(crtc->bo->active_scanout);
assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
crtc->bo->active_scanout--;
kgem_bo_destroy(&sna->kgem, crtc->bo);
- assert(crtc->flip_bo->active_scanout >= 1);
- assert(crtc->flip_bo->refcnt >= crtc->flip_bo->active_scanout);
crtc->bo = crtc->flip_bo;
crtc->flip_bo = NULL;
} else {
- assert(crtc->flip_bo->active_scanout);
- assert(crtc->flip_bo->refcnt >= crtc->flip_bo->active_scanout);
crtc->flip_bo->active_scanout--;
kgem_bo_destroy(&sna->kgem, crtc->flip_bo);
crtc->flip_bo = NULL;