Skip to contentSkip to conversation

Use root window (pixmap) instead of screen pixmap for scanout updates

PATCH In review Michel Dänzer 2 participants 4 messages Aug 2, 2017 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 Use root window (pixmap) instead of screen pixmap for scanout updates

From: Michel Dänzer <[email protected]>

Preparation for following changes, no functional change intended yet.

(Ported from radeon commit c2d26890691ec105858f086b63170ad94c6f7f05)

---
 src/amdgpu_kms.c      |  2 +-
 src/drmmode_display.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)
src/amdgpu_kms.c +1 -1
index 2355a8979..c86f117f9 100644
@@ -877,7 +877,7 @@ amdgpu_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id)
 		GCPtr gc = GetScratchGC(pDraw->depth, pScreen);
 
 		ValidateGC(pDraw, gc);
-		(*gc->ops->CopyArea)(&pScreen->GetScreenPixmap(pScreen)->drawable,
+		(*gc->ops->CopyArea)(&pScreen->GetWindowPixmap(pScreen->root)->drawable,
 				     pDraw, gc,
 				     xf86_crtc->x + extents.x1, xf86_crtc->y + extents.y1,
 				     extents.x2 - extents.x1, extents.y2 - extents.y1,
src/drmmode_display.c +14 -7
index 9b33d4dbb..8ddb2ac9b 100644
@@ -471,11 +471,8 @@ drmmode_crtc_scanout_free(drmmode_crtc_private_ptr drmmode_crtc)
 					     &drmmode_crtc->scanout[1]);
 	}
 
-	if (drmmode_crtc->scanout_damage) {
+	if (drmmode_crtc->scanout_damage)
 		DamageDestroy(drmmode_crtc->scanout_damage);
-		drmmode_crtc->scanout_damage = NULL;
-		RegionUninit(&drmmode_crtc->scanout_last_region);
-	}
 }
 
 void
@@ -543,6 +540,15 @@ amdgpu_screen_damage_report(DamagePtr damage, RegionPtr region, void *closure)
 	damage->damage.data = NULL;
 }
 
+static void
+drmmode_screen_damage_destroy(DamagePtr damage, void *closure)
+{
+	drmmode_crtc_private_ptr drmmode_crtc = closure;
+
+	drmmode_crtc->scanout_damage = NULL;
+	RegionUninit(&drmmode_crtc->scanout_last_region);
+}
+
 static Bool
 drmmode_can_use_hw_cursor(xf86CrtcPtr crtc)
 {
@@ -730,9 +736,10 @@ drmmode_crtc_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
 		if (!drmmode_crtc->scanout_damage) {
 			drmmode_crtc->scanout_damage =
 				DamageCreate(amdgpu_screen_damage_report,
-					     NULL, DamageReportRawRegion,
-					     TRUE, screen, NULL);
-			DamageRegister(&screen->GetScreenPixmap(screen)->drawable,
+					     drmmode_screen_damage_destroy,
+					     DamageReportRawRegion,
+					     TRUE, screen, drmmode_crtc);
+			DamageRegister(&screen->root->drawable,
 				       drmmode_crtc->scanout_damage);
 		}
 
Signature · 6 lines
2.13.3

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170802101248.2463-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org

#2 lore raw

PATCH 2/3 Add drmmode_crtc_can_flip helper

From: Michel Dänzer <[email protected]>

To reduce code duplication between DRI2 and Present. No functional change intended yet.

(Ported from radeon commit 9bc3eef74452d924f9101c024f66ad9b14c404c8)

---
 src/amdgpu_dri2.c     |  5 +----
 src/amdgpu_present.c  |  8 +++-----
 src/drmmode_display.h | 11 +++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
src/amdgpu_dri2.c +1 -4
index a854ce50b..b4cb1ecc7 100644
@@ -655,14 +655,11 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
 		xf86CrtcPtr crtc = config->crtc[i];
 		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
-		if (!crtc->enabled)
-			continue;
-
 		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
 		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
 			return FALSE;
 
-		if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
+		if (drmmode_crtc_can_flip(crtc))
 			num_crtcs_on++;
 	}
 
src/amdgpu_present.c +3 -5
index cf11d2b7a..375456976 100644
@@ -228,16 +228,14 @@ amdgpu_present_check_unflip(ScrnInfoPtr scrn)
 		return FALSE;
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
-		drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private;
-
-		if (!config->crtc[i]->enabled)
-			continue;
+		xf86CrtcPtr crtc = config->crtc[i];
+		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
 		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
 		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
 			return FALSE;
 
-		if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
+		if (drmmode_crtc_can_flip(crtc))
 			num_crtcs_on++;
 	}
 
src/drmmode_display.h +11 -0
index 309ec6704..677f796b1 100644
@@ -132,6 +132,17 @@ enum drmmode_flip_sync {
 };
 
 
+/* Can the page flip ioctl be used for this CRTC? */
+static inline Bool
+drmmode_crtc_can_flip(xf86CrtcPtr crtc)
+{
+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+
+	return crtc->enabled &&
+		drmmode_crtc->pending_dpms_mode == DPMSModeOn;
+}
+
+
 static inline void
 drmmode_fb_reference_loc(int drm_fd, struct drmmode_fb **old, struct drmmode_fb *new,
 			 const char *caller, unsigned line)
Signature · 6 lines
2.13.3

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 3/3 Allow DRI page flipping when some CRTCs use separate scanout buffers

In reply to a message not in the archive

From: Michel Dänzer <[email protected]>

As long as the CRTC we're synchronizing to doesn't.

(Ported from radeon commit 5309bde0c4e28adf2b167191c6d7011a19e31eed)

---
 man/amdgpu.man        |  2 +-
 src/amdgpu_dri2.c     | 30 +++++++-----------------------
 src/amdgpu_present.c  | 12 ++++--------
 src/drmmode_display.c |  2 +-
 src/drmmode_display.h |  4 +++-
 5 files changed, 16 insertions(+), 34 deletions(-)
man/amdgpu.man +1 -1
index d6904b818..ebb472aba 100644
@@ -77,7 +77,7 @@ Set the default value of the per-output 'TearFree' property, which controls
 tearing prevention using the hardware page flipping mechanism. TearFree is
 on for any CRTC associated with one or more outputs with TearFree on. Two
 separate scanout buffers need to be allocated for each CRTC with TearFree
-on. While TearFree is on for any CRTC, it currently prevents clients from using
+on. While TearFree is on for any CRTC, it may prevent clients from using
 DRI page flipping. If this option is set, the default value of the property
 is 'on' or 'off' accordingly. If this option isn't set, the default value of the
 property is
src/amdgpu_dri2.c +7 -23
index b4cb1ecc7..dfbc9998c 100644
@@ -600,18 +600,6 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
 	struct dri2_buffer_priv *back_priv = back->driverPrivate;
 	PixmapPtr front_pixmap;
 	PixmapPtr back_pixmap = back_priv->pixmap;
-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-	int i;
-
-	for (i = 0; i < xf86_config->num_crtc; i++) {
-		xf86CrtcPtr crtc = xf86_config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-
-		if (crtc->enabled &&
-		    (crtc->rotatedData ||
-		     drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo))
-			return FALSE;
-	}
 
 	if (!update_front(draw, front))
 		return FALSE;
@@ -635,9 +623,10 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
 }
 
 static Bool
-can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
+can_flip(xf86CrtcPtr crtc, DrawablePtr draw,
 	 DRI2BufferPtr front, DRI2BufferPtr back)
 {
+	ScrnInfoPtr pScrn = crtc->scrn;
 	AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 	int num_crtcs_on;
@@ -652,15 +641,10 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
 		return FALSE;
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
-		xf86CrtcPtr crtc = config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-
-		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
-		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
-			return FALSE;
-
-		if (drmmode_crtc_can_flip(crtc))
+		if (drmmode_crtc_can_flip(config->crtc[i]))
 			num_crtcs_on++;
+		else if (config->crtc[i] == crtc)
+			return FALSE;
 	}
 
 	return num_crtcs_on > 0 && can_exchange(pScrn, draw, front, back);
@@ -745,7 +729,7 @@ static void amdgpu_dri2_frame_event_handler(xf86CrtcPtr crtc, uint32_t seq,
 
 	switch (event->type) {
 	case DRI2_FLIP:
-		if (can_flip(scrn, drawable, event->front, event->back) &&
+		if (can_flip(crtc, drawable, event->front, event->back) &&
 		    amdgpu_dri2_schedule_flip(crtc,
 					      event->client,
 					      drawable,
@@ -1237,7 +1221,7 @@ static int amdgpu_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
 	current_msc &= 0xffffffff;
 
 	/* Flips need to be submitted one frame before */
-	if (can_flip(scrn, draw, front, back)) {
+	if (can_flip(crtc, draw, front, back)) {
 		swap_info->type = DRI2_FLIP;
 		flip = 1;
 	}
src/amdgpu_present.c +4 -8
index 375456976..550b70242 100644
@@ -228,14 +228,7 @@ amdgpu_present_check_unflip(ScrnInfoPtr scrn)
 		return FALSE;
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
-		xf86CrtcPtr crtc = config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-
-		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
-		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
-			return FALSE;
-
-		if (drmmode_crtc_can_flip(crtc))
+		if (drmmode_crtc_can_flip(config->crtc[i]))
 			num_crtcs_on++;
 	}
 
@@ -269,6 +262,9 @@ amdgpu_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
 	    amdgpu_pixmap_get_tiling_info(screen->GetScreenPixmap(screen)))
 		return FALSE;
 
+	if (!drmmode_crtc_can_flip(crtc->devPrivate))
+		return FALSE;
+
 	return amdgpu_present_check_unflip(scrn);
 }
 
src/drmmode_display.c +1 -1
index 8ddb2ac9b..75cf7842f 100644
@@ -2814,7 +2814,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
 	for (i = 0; i < config->num_crtc; i++) {
 		crtc = config->crtc[i];
 
-		if (!crtc->enabled)
+		if (!drmmode_crtc_can_flip(crtc))
 			continue;
 
 		flipdata->flip_count++;
src/drmmode_display.h +3 -1
index 677f796b1..ca556f254 100644
@@ -139,7 +139,9 @@ drmmode_crtc_can_flip(xf86CrtcPtr crtc)
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
 	return crtc->enabled &&
-		drmmode_crtc->pending_dpms_mode == DPMSModeOn;
+		drmmode_crtc->pending_dpms_mode == DPMSModeOn &&
+		!drmmode_crtc->rotate.bo &&
+		!drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo;
 }
 
 
Signature · 6 lines
2.13.3

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170802101248.2463-3-michel-otUistvHUpPR7s880joybQ@public.gmane.org

Reviewed-by Alex Deucher
#5 lore raw

RE: [PATCH xf86-video-amdgpu 3/3] Allow DRI page flipping when some CRTCs use separate scanout buffers

Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Wednesday, August 02, 2017 6:13 AM
To: [email protected]
Subject: [PATCH xf86-video-amdgpu 3/3] Allow DRI page flipping when some CRTCs use separate scanout buffers

Quoted 8 lines

From: Michel Dänzer <[email protected]>

As long as the CRTC we're synchronizing to doesn't.

(Ported from radeon commit
5309bde0c4e28adf2b167191c6d7011a19e31eed)

Series is:

Quoted 167 lines
---
 man/amdgpu.man        |  2 +-
 src/amdgpu_dri2.c     | 30 +++++++-----------------------
 src/amdgpu_present.c  | 12 ++++--------
 src/drmmode_display.c |  2 +-
 src/drmmode_display.h |  4 +++-
 5 files changed, 16 insertions(+), 34 deletions(-)
man/amdgpu.man +0 -0
index d6904b818..ebb472aba 100644
@@ -77,7 +77,7 @@ Set the default value of the per-output 'TearFree'

property, which controls
tearing prevention using the hardware page flipping mechanism. TearFree is on for any CRTC associated with one or more outputs with TearFree on. Two separate scanout buffers need to be allocated for each CRTC with TearFree
-on. While TearFree is on for any CRTC, it currently prevents clients from using

man/amdgpu.man +1 -0
+on. While TearFree is on for any CRTC, it may prevent clients from using
 DRI page flipping. If this option is set, the default value of the property
 is 'on' or 'off' accordingly. If this option isn't set, the default value of the
 property is
src/amdgpu_dri2.c +0 -12
index b4cb1ecc7..dfbc9998c 100644
@@ -600,18 +600,6 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
 	struct dri2_buffer_priv *back_priv = back->driverPrivate;
 	PixmapPtr front_pixmap;
 	PixmapPtr back_pixmap = back_priv->pixmap;
-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-	int i;
-
-	for (i = 0; i < xf86_config->num_crtc; i++) {
-		xf86CrtcPtr crtc = xf86_config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc-
 >driver_private;
-
-		if (crtc->enabled &&
-		    (crtc->rotatedData ||
-		     drmmode_crtc->scanout[drmmode_crtc-
 >scanout_id].bo))
-			return FALSE;
-	}
 
src/amdgpu_dri2.c +5 -9
 	if (!update_front(draw, front))
 		return FALSE;
@@ -635,9 +623,10 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
 }
 
 static Bool
-can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
+can_flip(xf86CrtcPtr crtc, DrawablePtr draw,
 	 DRI2BufferPtr front, DRI2BufferPtr back)
 {
+	ScrnInfoPtr pScrn = crtc->scrn;
 	AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
 	int num_crtcs_on;
@@ -652,15 +641,10 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
 		return FALSE;
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
-		xf86CrtcPtr crtc = config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc-
 >driver_private;
-
-		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
-		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
-			return FALSE;
-
-		if (drmmode_crtc_can_flip(crtc))
+		if (drmmode_crtc_can_flip(config->crtc[i]))
 			num_crtcs_on++;
+		else if (config->crtc[i] == crtc)
+			return FALSE;
 	}
 

return num_crtcs_on > 0 && can_exchange(pScrn, draw, front,
back);

src/amdgpu_dri2.c +1 -1
@@ -745,7 +729,7 @@ static void
 amdgpu_dri2_frame_event_handler(xf86CrtcPtr crtc, uint32_t seq,
 
 	switch (event->type) {
 	case DRI2_FLIP:
-		if (can_flip(scrn, drawable, event->front, event->back) &&
+		if (can_flip(crtc, drawable, event->front, event->back) &&
 		    amdgpu_dri2_schedule_flip(crtc,
 					      event->client,
src/amdgpu_dri2.c +1 -1
 					      drawable,
@@ -1237,7 +1221,7 @@ static int amdgpu_dri2_schedule_swap(ClientPtr
 client, DrawablePtr draw,
 	current_msc &= 0xffffffff;
 
 	/* Flips need to be submitted one frame before */
-	if (can_flip(scrn, draw, front, back)) {
+	if (can_flip(crtc, draw, front, back)) {
 		swap_info->type = DRI2_FLIP;
 		flip = 1;
src/amdgpu_dri2.c +0 -0
 	}
src/amdgpu_present.c +4 -8
index 375456976..550b70242 100644
@@ -228,14 +228,7 @@ amdgpu_present_check_unflip(ScrnInfoPtr scrn)
 		return FALSE;
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
-		xf86CrtcPtr crtc = config->crtc[i];
-		drmmode_crtc_private_ptr drmmode_crtc = crtc-
 >driver_private;
-
-		if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
-		    drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
-			return FALSE;
-
-		if (drmmode_crtc_can_flip(crtc))
+		if (drmmode_crtc_can_flip(config->crtc[i]))
 			num_crtcs_on++;
 	}
@@ -269,6 +262,9 @@ amdgpu_present_check_flip(RRCrtcPtr crtc,
 WindowPtr window, PixmapPtr pixmap,
 	    amdgpu_pixmap_get_tiling_info(screen-
 >GetScreenPixmap(screen)))
 		return FALSE;
 
+	if (!drmmode_crtc_can_flip(crtc->devPrivate))
+		return FALSE;
+
 	return amdgpu_present_check_unflip(scrn);

}

src/drmmode_display.c +1 -1
index 8ddb2ac9b..75cf7842f 100644
@@ -2814,7 +2814,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn,
 ClientPtr client,
 	for (i = 0; i < config->num_crtc; i++) {
 		crtc = config->crtc[i];
 
-		if (!crtc->enabled)
+		if (!drmmode_crtc_can_flip(crtc))
 			continue;
 
src/drmmode_display.c +0 -0
 		flipdata->flip_count++;
src/drmmode_display.h +1 -1
index 677f796b1..ca556f254 100644
@@ -139,7 +139,9 @@ drmmode_crtc_can_flip(xf86CrtcPtr crtc)
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
 	return crtc->enabled &&
-		drmmode_crtc->pending_dpms_mode == DPMSModeOn;
+		drmmode_crtc->pending_dpms_mode == DPMSModeOn

&&

src/drmmode_display.h +2 -1
+		!drmmode_crtc->rotate.bo &&
+		!drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo;
 }
 
 
--

2.13.3

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx