Attachment 120682 Details for Bug 90789 – Add support for transforms to separate scanout buffer infrastructure

[patch] Add support for transforms to separate scanout buffer infrastructure

0001-Add-support-for-transforms-to-separate-scanout-buffe.patch (text/plain), 10.32 KB, created by Michel Dänzer on 2015-12-25 10:13:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2015-12-25 10:13:53 UTC

Size: 10.32 KB

patch

obsolete

>From fa04ef8668cae9a3e4e375afa399c720b2148228 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Fri, 25 Dec 2015 18:57:42 +0900
>Subject: [PATCH] Add support for transforms to separate scanout buffer
> infrastructure
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> src/drmmode_display.c |  81 +++++++++++++++++++++++++++++++---
> src/radeon_kms.c      | 119 +++++++++++++++++++++++++++++++++++++-------------
> 2 files changed, 163 insertions(+), 37 deletions(-)
>
>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index 9880ee3..8609b30 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -719,7 +719,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
> 
> 			drmmode_crtc_scanout_destroy(drmmode, &drmmode_crtc->scanout[0]);
> 			drmmode_crtc_scanout_destroy(drmmode, &drmmode_crtc->scanout[1]);
>-		} else if (info->tear_free || info->shadow_primary) {
>+		} else if (info->tear_free || info->shadow_primary ||
>+			   crtc->transform_in_use) {
> 			for (i = 0; i < (info->tear_free ? 2 : 1); i++) {
> 				drmmode_crtc_scanout_create(crtc,
> 							    &drmmode_crtc->scanout[i],
>@@ -745,8 +746,17 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
> 					pBox = RegionExtents(pRegion);
> 					pBox->x1 = min(pBox->x1, x);
> 					pBox->y1 = min(pBox->y1, y);
>-					pBox->x2 = max(pBox->x2, x + mode->HDisplay);
>-					pBox->y2 = max(pBox->y2, y + mode->VDisplay);
>+
>+					switch (crtc->rotation & 0xf) {
>+					case RR_Rotate_90:
>+					case RR_Rotate_270:
>+						pBox->x2 = max(pBox->x2, x + mode->VDisplay);
>+						pBox->y2 = max(pBox->y2, y + mode->HDisplay);
>+						break;
>+					default:
>+						pBox->x2 = max(pBox->x2, x + mode->HDisplay);
>+						pBox->y2 = max(pBox->y2, y + mode->VDisplay);
>+					}
> 				}
> 			}
> 
>@@ -819,24 +829,77 @@ drmmode_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
> 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
> 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
> 
>+	if (crtc->driverIsPerformingTransform && crtc->transform_in_use)
>+		xf86CrtcTransformCursorPos(crtc, &x, &y);
>+
> 	drmModeMoveCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, x, y);
> }
> 
>+static int
>+drmmode_cursor_src_offset(Rotation rotation, int width, int height,
>+			  int x_dst, int y_dst)
>+{
>+	int t;
>+
>+	switch (rotation & 0xf) {
>+	case RR_Rotate_90:
>+		t = x_dst;
>+		x_dst = height - y_dst - 1;
>+		y_dst = t;
>+		break;
>+	case RR_Rotate_180:
>+		x_dst = width - x_dst - 1;
>+		y_dst = height - y_dst - 1;
>+		break;
>+	case RR_Rotate_270:
>+		t = x_dst;
>+		x_dst = y_dst;
>+		y_dst = width - t - 1;
>+		break;
>+	}
>+
>+	if (rotation & RR_Reflect_X)
>+		x_dst = width - x_dst - 1;
>+	if (rotation & RR_Reflect_Y)
>+		y_dst = height - y_dst - 1;
>+
>+	return y_dst * height + x_dst;
>+}
>+
> static void
> drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
> {
> 	ScrnInfoPtr pScrn = crtc->scrn;
> 	RADEONInfoPtr info = RADEONPTR(pScrn);
> 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
>-	int i;
>+	int dstx, dsty;
> 	uint32_t *ptr;
>-	uint32_t cursor_size = info->cursor_w * info->cursor_h;
> 
> 	/* cursor should be mapped already */
> 	ptr = (uint32_t *)(drmmode_crtc->cursor_bo->ptr);
> 
>-	for (i = 0; i < cursor_size; i++)
>-		ptr[i] = cpu_to_le32(image[i]);
>+	if (crtc->driverIsPerformingTransform && crtc->transform_in_use) {
>+		uint32_t cursor_w = info->cursor_w, cursor_h = info->cursor_h;
>+		int srcoffset;
>+
>+		for (dsty = 0; dsty < cursor_h; dsty++) {
>+			for (dstx = 0; dstx < cursor_w; dstx++) {
>+				srcoffset = drmmode_cursor_src_offset(crtc->rotation,
>+								      cursor_w,
>+								      cursor_h,
>+								      dstx, dsty);
>+
>+				ptr[dsty * info->cursor_w + dstx] =
>+					cpu_to_le32(image[srcoffset]);
>+			}
>+		}
>+	} else {
>+		uint32_t cursor_size = info->cursor_w * info->cursor_h;
>+		int i;
>+
>+		for (i = 0; i < cursor_size; i++)
>+			ptr[i] = cpu_to_le32(image[i]);
>+	}
> }
> 
> 
>@@ -2204,6 +2267,7 @@ void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
> Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
> 			       Bool set_hw)
> {
>+	RADEONInfoPtr info = RADEONPTR(pScrn);
> 	xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
> 	int c;
> 
>@@ -2253,6 +2317,9 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
> 			crtc->desiredY = 0;
> 		}
> 
>+		if (1 || info->tear_free || info->shadow_primary)
>+		    crtc->driverIsPerformingTransform = TRUE;
>+
> 		if (set_hw) {
> 			if (!crtc->funcs->set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation,
> 							 crtc->desiredX, crtc->desiredY))
>diff --git a/src/radeon_kms.c b/src/radeon_kms.c
>index d459740..e5b845f 100644
>--- a/src/radeon_kms.c
>+++ b/src/radeon_kms.c
>@@ -319,12 +319,22 @@ radeon_dirty_update(ScreenPtr screen)
> #endif
> 
> static Bool
>-radeon_scanout_extents_intersect(BoxPtr extents, int x, int y, int w, int h)
>+radeon_scanout_extents_intersect(xf86CrtcPtr xf86_crtc, BoxPtr extents, int w,
>+				 int h)
> {
>-    extents->x1 = max(extents->x1 - x, 0);
>-    extents->y1 = max(extents->y1 - y, 0);
>-    extents->x2 = min(extents->x2 - x, w);
>-    extents->y2 = min(extents->y2 - y, h);
>+    extents->x1 = max(extents->x1 - xf86_crtc->x, 0);
>+    extents->y1 = max(extents->y1 - xf86_crtc->y, 0);
>+
>+    switch (xf86_crtc->rotation & 0xf) {
>+    case RR_Rotate_90:
>+    case RR_Rotate_270:
>+	extents->x2 = min(extents->x2 - xf86_crtc->x, h);
>+	extents->y2 = min(extents->y2 - xf86_crtc->y, w);
>+	break;
>+    default:
>+	extents->x2 = min(extents->x2 - xf86_crtc->x, w);
>+	extents->y2 = min(extents->y2 - xf86_crtc->y, h);
>+    }
> 
>     return (extents->x1 < extents->x2 && extents->y1 < extents->y2);
> }
>@@ -338,7 +348,6 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id)
>     RegionPtr pRegion;
>     DrawablePtr pDraw;
>     ScreenPtr pScreen;
>-    GCPtr gc;
>     BoxRec extents;
>     RADEONInfoPtr info;
>     Bool force;
>@@ -357,31 +366,83 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id)
> 	return FALSE;
> 
>     pDraw = &drmmode_crtc->scanout[scanout_id].pixmap->drawable;
>+    pScreen = pDraw->pScreen;
>     extents = *RegionExtents(pRegion);
>     RegionEmpty(pRegion);
>-    if (!radeon_scanout_extents_intersect(&extents, xf86_crtc->x, xf86_crtc->y,
>-					  pDraw->width, pDraw->height))
>+    if (!radeon_scanout_extents_intersect(xf86_crtc, &extents, pDraw->width,
>+					  pDraw->height))
> 	return FALSE;
> 
>-    pScreen = pDraw->pScreen;
>-    gc = GetScratchGC(pDraw->depth, pScreen);
>     scrn = xf86_crtc->scrn;
>     info = RADEONPTR(scrn);
>     force = info->accel_state->force;
>     info->accel_state->force = TRUE;
> 
>-    ValidateGC(pDraw, gc);
>-    (*gc->ops->CopyArea)(&pScreen->GetScreenPixmap(pScreen)->drawable,
>-			 pDraw, gc,
>-			 xf86_crtc->x + extents.x1, xf86_crtc->y + extents.y1,
>-			 extents.x2 - extents.x1, extents.y2 - extents.y1,
>-			 extents.x1, extents.y1);
>-    FreeScratchGC(gc);
>+    if (xf86_crtc->transform_in_use) {
>+	PictFormatPtr format = PictureWindowFormat(pScreen->root);
>+	int error;
>+	PicturePtr src, dst;
>+	XID include_inferiors = IncludeInferiors;
>+
>+	src = CreatePicture(None,
>+			    &pScreen->root->drawable,
>+			    format,
>+			    CPSubwindowMode,
>+			    &include_inferiors, serverClient, &error);
>+	if (!src) {
>+	    ErrorF("Failed to create source picture for transformed scanout "
>+		   "update\n");
>+	    goto out;
>+	}
>+
>+	dst = CreatePicture(None, pDraw, format, 0L, NULL, serverClient, &error);
>+	if (!dst) {
>+	    ErrorF("Failed to create destination picture for transformed scanout "
>+		   "update\n");
>+	    goto out;
>+	}
> 
>-    info->accel_state->force = force;
>+	error = SetPictureTransform(src, &xf86_crtc->crtc_to_framebuffer);
>+	if (error) {
>+	    ErrorF("SetPictureTransform failed for transformed scanout "
>+		   "update\n");
>+	    goto out;
>+	}
>+
>+	if (xf86_crtc->transform_in_use && xf86_crtc->filter)
>+	    SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
>+				 xf86_crtc->nparams);
>+
>+	extents.x1 += xf86_crtc->x - (xf86_crtc->filter_width >> 1);
>+	extents.x2 += xf86_crtc->x + (xf86_crtc->filter_width >> 1);
>+	extents.y1 += xf86_crtc->y - (xf86_crtc->filter_height >> 1);
>+	extents.y2 += xf86_crtc->y + (xf86_crtc->filter_height >> 1);
>+	pixman_f_transform_bounds(&xf86_crtc->f_framebuffer_to_crtc, &extents);
>+	CompositePicture(PictOpSrc,
>+			 src, NULL, dst,
>+			 extents.x1, extents.y1, 0, 0, extents.x1,
>+			 extents.y1, extents.x2 - extents.x1,
>+			 extents.y2 - extents.y1);
>+
>+	FreePicture(src, None);
>+	FreePicture(dst, None);
>+    } else {
>+	GCPtr gc = GetScratchGC(pDraw->depth, pScreen);
>+
>+	ValidateGC(pDraw, gc);
>+	(*gc->ops->CopyArea)(&pScreen->GetScreenPixmap(pScreen)->drawable,
>+			     pDraw, gc,
>+			     xf86_crtc->x + extents.x1, xf86_crtc->y + extents.y1,
>+			     extents.x2 - extents.x1, extents.y2 - extents.y1,
>+			     extents.x1, extents.y1);
>+	FreeScratchGC(gc);
>+    }
> 
>     radeon_cs_flush_indirect(scrn);
> 
>+ out:
>+    info->accel_state->force = force;
>+
>     return TRUE;
> }
> 
>@@ -431,8 +492,8 @@ radeon_scanout_update(xf86CrtcPtr xf86_crtc)
> 
>     pDraw = &drmmode_crtc->scanout[0].pixmap->drawable;
>     extents = *RegionExtents(pRegion);
>-    if (!radeon_scanout_extents_intersect(&extents, xf86_crtc->x, xf86_crtc->y,
>-					  pDraw->width, pDraw->height))
>+    if (!radeon_scanout_extents_intersect(xf86_crtc, &extents, pDraw->width,
>+					  pDraw->height))
> 	return;
> 
>     scrn = xf86_crtc->scrn;
>@@ -521,21 +582,19 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
>     SCREEN_PTR(arg);
>     ScrnInfoPtr    pScrn   = xf86ScreenToScrn(pScreen);
>     RADEONInfoPtr  info    = RADEONPTR(pScrn);
>+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
>+    int c;
> 
>     pScreen->BlockHandler = info->BlockHandler;
>     (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
>     pScreen->BlockHandler = RADEONBlockHandler_KMS;
> 
>-    if (info->tear_free || info->shadow_primary) {
>-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
>-	int c;
>-
>-	for (c = 0; c < xf86_config->num_crtc; c++) {
>-	    if (info->tear_free)
>-		radeon_scanout_flip(pScreen, info, xf86_config->crtc[c]);
>-	    else
>-		radeon_scanout_update(xf86_config->crtc[c]);
>-	}
>+    for (c = 0; c < xf86_config->num_crtc; c++) {
>+	if (info->tear_free)
>+	    radeon_scanout_flip(pScreen, info, xf86_config->crtc[c]);
>+	else if (info->shadow_primary ||
>+		 xf86_config->crtc[c]->transform_in_use)
>+	    radeon_scanout_update(xf86_config->crtc[c]);
>     }
> 
>     radeon_cs_flush_indirect(pScrn);
>-- 
>2.6.2
>

Actions: View | Splinter Review

Attachments on bug 90789: 120681 | 120682 | 120703

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.