Attachment 103611 Details for Bug 81820 – Fix clear shortcut in CRTC redisplay

[patch] Fix clear shortcut in CRTC redisplay

0001-sna-Fix-clear-shortcut-for-transformations.patch (text/plain), 2.82 KB, created by Chris Wilson on 2014-07-28 20:18:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-07-28 20:18:40 UTC

Size: 2.82 KB

patch

obsolete

>From 1fecf78290ed9d25a4eb1041d2442e63ec0cc71f Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 28 Jul 2014 21:16:33 +0100
>Subject: [PATCH] sna: Fix clear shortcut for transformations
>
>The region needs to be transformed along the clear shortcut when
>redisplaying the CRTC.
>
>Reported-by: Dirk Griesbach
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81820
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_display.c | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
>index 135d03a..8964e77 100644
>--- a/src/sna/sna_display.c
>+++ b/src/sna/sna_display.c
>@@ -6349,7 +6349,7 @@ free_pixmap:
> }
> 
> static void
>-sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
>+sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
> {
> 	int16_t tx, ty, sx, sy;
> 	struct sna *sna = to_sna(crtc->scrn);
>@@ -6367,11 +6367,21 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
> 	assert(!wedged(sna));
> 
> 	if (priv->clear) {
>+		RegionRec whole;
>+
> 		DBG(("%s: clear damage boxes\n", __FUNCTION__));
> 
>-		RegionTranslate(region, -crtc->bounds.x1, -crtc->bounds.y1);
>+		if (sna_transform_is_integer_translation(&crtc->crtc_to_framebuffer,
>+							 &tx, &ty)) {
>+			RegionTranslate(region, -tx, -ty);
>+		} else {
>+			whole.extents = region->extents;
>+			whole.data = NULL;
>+			transformed_box(&whole.extents, crtc);
>+			region = &whole;
>+		}
> 		sna_blt_fill_boxes(sna, GXcopy,
>-				   sna_crtc->bo, draw->bitsPerPixel,
>+				   bo, draw->bitsPerPixel,
> 				   priv->clear_color,
> 				   region_rects(region), region_num_rects(region));
> 		return;
>@@ -6391,15 +6401,15 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
> 
> 		if (sna->render.copy_boxes(sna, GXcopy,
> 					   draw, priv->gpu_bo, sx, sy,
>-					   &tmp, sna_crtc->bo, -tx, -ty,
>+					   &tmp, bo, -tx, -ty,
> 					   region_rects(region), region_num_rects(region), 0))
> 			return;
> 	}
> 
> 	if (can_render(sna))
>-		sna_crtc_redisplay__composite(crtc, region, sna_crtc->bo);
>+		sna_crtc_redisplay__composite(crtc, region, bo);
> 	else
>-		sna_crtc_redisplay__fallback(crtc, region, sna_crtc->bo);
>+		sna_crtc_redisplay__fallback(crtc, region, bo);
> }
> 
> #define shadow_flip_handler (sna_flip_handler_t)sna_mode_redisplay
>@@ -6590,7 +6600,7 @@ void sna_mode_redisplay(struct sna *sna)
> 				if (bo == NULL)
> 					goto disable1;
> 
>-				sna_crtc_redisplay__composite(crtc, &damage, bo);
>+				sna_crtc_redisplay(crtc, &damage, bo);
> 				kgem_bo_submit(&sna->kgem, bo);
> 
> 				arg.crtc_id = sna_crtc->id;
>@@ -6642,7 +6652,7 @@ disable1:
> 
> 				sna_crtc->shadow_bo = kgem_bo_reference(sna_crtc->bo);
> 			} else {
>-				sna_crtc_redisplay(crtc, &damage);
>+				sna_crtc_redisplay(crtc, &damage, sna_crtc->bo);
> 				kgem_scanout_flush(&sna->kgem, sna_crtc->bo);
> 			}
> 		}
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 81820: 103562 | 103563 | 103564 | 103565 | 103566 | 103611 | 103629

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.