From d959014c10e2408ed2f073bd5fcb8c558a17da07 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 31 Oct 2014 16:12:37 +0000 Subject: [PATCH] sna: Modicum of extra DBG for transformed redisplay Signed-off-by: Chris Wilson --- src/sna/gen6_render.c | 2 +- src/sna/sna_display.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index 95eb415d..25044685 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -755,7 +755,7 @@ gen6_emit_drawing_rectangle(struct sna *sna, OUT_BATCH(0); DBG(("%s: offset=(%d, %d), limit=(%d, %d)\n", - __FUNCTION__, op->dst.x, op->dst.y, op->dst.width, op->dst.width)); + __FUNCTION__, op->dst.x, op->dst.y, op->dst.width, op->dst.height)); OUT_BATCH(GEN6_3DSTATE_DRAWING_RECTANGLE | (4 - 2)); OUT_BATCH(0); OUT_BATCH(limit); diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index f3971c68..0889f9dc 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -6604,6 +6604,10 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo return; } + DBG(("%s: dst format=%08x, depth=%d, bpp=%d, pitch=%d, size=%dx%d\n", + __FUNCTION__, format->format, depth, draw->bitsPerPixel, + bo->pitch, crtc->mode.HDisplay, crtc->mode.VDisplay)); + ptr = kgem_bo_map__gtt(&sna->kgem, bo); if (ptr == NULL) return; @@ -6627,7 +6631,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo if (error) goto free_src; - if (crtc->filter) + if (crtc->filter && crtc->transform_in_use) SetPicturePictFilter(src, crtc->filter, crtc->params, crtc->nparams); @@ -6693,6 +6697,10 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo return; } + DBG(("%s: dst format=%08x, depth=%d, bpp=%d, pitch=%d, size=%dx%d\n", + __FUNCTION__, format->format, depth, draw->bitsPerPixel, + bo->pitch, crtc->mode.HDisplay, crtc->mode.VDisplay)); + pixmap = sna_pixmap_create_unattached(screen, 0, 0, depth); if (pixmap == NullPixmap) return; @@ -6717,7 +6725,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo if (error) goto free_src; - if (crtc->filter) + if (crtc->filter && crtc->transform_in_use) SetPicturePictFilter(src, crtc->filter, crtc->params, crtc->nparams);