diff options
| -rw-r--r-- | src/sna/kgem.c | 1 | ||||
| -rw-r--r-- | src/sna/sna_accel.c | 9 | ||||
| -rw-r--r-- | src/sna/sna_composite.c | 11 | ||||
| -rw-r--r-- | src/sna/sna_display.c | 4 | ||||
| -rw-r--r-- | src/sna/sna_render.c | 6 |
5 files changed, 24 insertions, 7 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 2a8dddcd..c309caed 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -2631,6 +2631,7 @@ void kgem_reset(struct kgem *kgem) bo->gpu_dirty = false; if (bo->needs_flush && __kgem_busy(kgem, bo->handle)) { + assert(bo->domain == DOMAIN_GPU || bo->domain == DOMAIN_NONE); list_add(&bo->request, &kgem->flushing); bo->rq = (void *)kgem; } else diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 909420d9..dbbc54ec 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -2289,7 +2289,14 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable, RegionTranslate(region, dx, dy); if (region_subsumes_drawable(region, &pixmap->drawable)) { - DBG(("%s: region subsumes drawable\n", __FUNCTION__)); + DBG(("%s: region (%d, %d), (%d, %d) subsumes pixmap (%dx%d)\n", + __FUNCTION__, + region->extents.x1, + region->extents.y1, + region->extents.x2, + region->extents.y2, + pixmap->drawable.width, + pixmap->drawable.height)); if (dx | dy) RegionTranslate(region, -dx, -dy); return _sna_pixmap_move_to_cpu(pixmap, flags); diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c index 566f042e..ae04c006 100644 --- a/src/sna/sna_composite.c +++ b/src/sna/sna_composite.c @@ -216,10 +216,13 @@ sna_compute_composite_region(RegionPtr region, pixman_region_fini (region); return FALSE; } - DBG(("%s: clip against src: (%d, %d), (%d, %d)\n", - __FUNCTION__, - region->extents.x1, region->extents.y1, - region->extents.x2, region->extents.y2)); + DBG(("%s: clip against src (%dx%d clip=%d): (%d, %d), (%d, %d)\n", + __FUNCTION__, + src->pDrawable ? src->pDrawable->width : 0, + src->pDrawable ? src->pDrawable->height : 0, + src->clientClipType, + region->extents.x1, region->extents.y1, + region->extents.x2, region->extents.y2)); if (src->alphaMap) { if (!clip_to_src(region, src->alphaMap, diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 67b7182c..010f5fac 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -3570,7 +3570,7 @@ void sna_mode_update(struct sna *sna) DBG(("%s: crtc=%d, valid?=%d, fb attached?=%d, expected=%d\n", __FUNCTION__, mode.crtc_id, mode.mode_valid, - mode.fb_id, fb_id, expected)); + mode.fb_id, expected)); if (mode.fb_id != expected) sna_crtc_disable(crtc); @@ -3779,7 +3779,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region) __FUNCTION__, sna_crtc->id, sna_crtc->pipe, region->extents.x1, region->extents.y1, region->extents.x2, region->extents.y2, - REGION_NUM_RECTS(region))); + (long)RegionNumRects(region))); assert(!wedged(sna)); diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 139081db..ebb1d303 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -553,8 +553,11 @@ static struct kgem_bo *upload(struct sna *sna, pixmap->usage_hint == 0 && channel->width == pixmap->drawable.width && channel->height == pixmap->drawable.height) { + DBG(("%s: adding upload cache to pixmap=%ld\n", + __FUNCTION__, pixmap->drawable.serialNumber)); assert(priv->gpu_damage == NULL); assert(priv->gpu_bo == NULL); + assert(bo->proxy != NULL); kgem_proxy_bo_attach(bo, &priv->gpu_bo); } } @@ -1210,8 +1213,11 @@ sna_render_picture_extract(struct sna *sna, if (priv != NULL && bo != NULL && box.x2 - box.x1 == pixmap->drawable.width && box.y2 - box.y1 == pixmap->drawable.height) { + DBG(("%s: adding upload cache to pixmap=%ld\n", + __FUNCTION__, pixmap->drawable.serialNumber)); assert(priv->gpu_damage == NULL); assert(priv->gpu_bo == NULL); + assert(bo->proxy != NULL); kgem_proxy_bo_attach(bo, &priv->gpu_bo); } } |