Attachment 119198 Details for Bug 92018 – Always flag the shadow buffer after resetting it fr DPMS on

[patch] Always flag the shadow buffer after resetting it fr DPMS on

0001-sna-Always-flag-the-shadow-buffer-after-resetting-it.patch (text/plain), 2.64 KB, created by Chris Wilson on 2015-10-26 11:47:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2015-10-26 11:47:54 UTC

Size: 2.64 KB

patch

obsolete

>From 32558cb42603c3a203b3b7cd9f49ec26b0e7c136 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sun, 25 Oct 2015 15:41:10 +0000
>Subject: [PATCH] sna: Always flag the shadow buffer after resetting it fr DPMS
> on
>
>When switching the outputs back on, we show the current front buffer and
>so for TearFree we always then need to flag the front buffer as active.
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=92018
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_display.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
>index a617218..e2f49ad 100644
>--- a/src/sna/sna_display.c
>+++ b/src/sna/sna_display.c
>@@ -2286,26 +2286,26 @@ out_shadow:
> 		}
> 
> 		if (sna->flags & SNA_TEAR_FREE) {
>+			RegionRec region;
>+
> 			assert(sna_crtc->slave_pixmap == NULL);
> 
> 			DBG(("%s: enabling TearFree shadow\n", __FUNCTION__));
>+			region.extents.x1 = 0;
>+			region.extents.y1 = 0;
>+			region.extents.x2 = sna->scrn->virtualX;
>+			region.extents.y2 = sna->scrn->virtualY;
>+			region.data = NULL;
>+
> 			if (!sna_crtc_enable_shadow(sna, sna_crtc)) {
> 				DBG(("%s: failed to enable crtc shadow\n", __FUNCTION__));
> 				return NULL;
> 			}
> 
> 			if (sna->mode.shadow == NULL && !wedged(sna)) {
>-				RegionRec region;
> 				struct kgem_bo *shadow;
> 
> 				DBG(("%s: creating TearFree shadow bo\n", __FUNCTION__));
>-
>-				region.extents.x1 = 0;
>-				region.extents.y1 = 0;
>-				region.extents.x2 = sna->scrn->virtualX;
>-				region.extents.y2 = sna->scrn->virtualY;
>-				region.data = NULL;
>-
> 				shadow = kgem_create_2d(&sna->kgem,
> 							region.extents.x2,
> 							region.extents.y2,
>@@ -2334,8 +2334,8 @@ out_shadow:
> 				assert(__sna_pixmap_get_bo(sna->front) == NULL ||
> 				       __sna_pixmap_get_bo(sna->front)->pitch == shadow->pitch);
> 				sna->mode.shadow = shadow;
>-				set_shadow(sna, &region);
> 			}
>+			set_shadow(sna, &region);
> 
> 			sna_crtc_disable_override(sna, sna_crtc);
> 		} else
>@@ -8449,7 +8449,7 @@ disable1:
> 
> 			assert(crtc != NULL);
> 			DBG(("%s: crtc %d [%d, pipe=%d] active? %d, transformed? %d\n",
>-			     __FUNCTION__, i, __sna_crtc_id(crtc), crtc->bo ? crtc->bo->handle : 0, crtc->transform));
>+			     __FUNCTION__, i, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->bo ? crtc->bo->handle : 0, crtc->transform));
> 			if (crtc->bo == NULL || crtc->transform)
> 				continue;
> 
>@@ -8500,6 +8500,8 @@ fixup_shadow:
> 
> 			if (crtc->bo == flip_bo) {
> 				assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
>+				DBG(("%s: flip handle=%d is already on the CRTC \n",
>+				     __FUNCTION__, flip_bo->handle));
> 				continue;
> 			}
> 
>-- 
>2.6.2
>

Actions: View | Splinter Review

Attachments on bug 92018: 118323 | 119186 | 119198

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.