diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-10-12 20:03:38 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-10-12 20:05:15 +0100 |
| commit | 04b4f3b7f7b3aa5837854fa2613b3473d7fed7cd (patch) | |
| tree | 6a03d19cb16f7192fe05b9547534c9702064e6ac | |
| parent | d287d46d5cc99dce25a7814952e4465f831498bc (diff) | |
sna: Fix up assert()s
Two pushes later and the discovery that the build scripts no longer do a
debug build leads to some embarrassment.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 33dbfc2d..eadc3cda 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -2159,7 +2159,7 @@ __sna_crtc_disable(struct sna *sna, struct sna_crtc *sna_crtc) if (sna_crtc->bo) { DBG(("%s: releasing handle=%d from scanout, active=%d\n", __FUNCTION__,sna_crtc->bo->handle, sna_crtc->bo->active_scanout-1)); - assert(sna_crtc->flags & CRTC_ON); + assert(sna_crtc->public.flags & CRTC_ON); assert(sna_crtc->bo->active_scanout); assert(sna_crtc->bo->refcnt >= sna_crtc->bo->active_scanout); sna_crtc->bo->active_scanout--; @@ -7859,7 +7859,7 @@ sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired) DBG(("%s: have PrimaryOutput? %d marking as desired\n", __FUNCTION__, output->crtc != NULL)); desired = output->crtc; } - assert(!desired || desired->pScreen == screen); + assert(!desired || desired->scrn == sna->scrn); } if (desired && to_sna_crtc(desired) && to_sna_crtc(desired)->bo) { BoxRec cover_box; |