Attachment 122630 Details for Bug 94751 – Update pixmap pitch in radeon_set_pixmap_bo

[patch] Update pixmap pitch in radeon_set_pixmap_bo

0001-Update-pixmap-pitch-in-radeon_set_pixmap_bo.patch (text/plain), 3.49 KB, created by Michel Dänzer on 2016-03-30 02:47:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-03-30 02:47:57 UTC

Size: 3.49 KB

patch

obsolete

>From 7ff34d0bc94fa6f8654c8797fda189e8ba2528dd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Wed, 30 Mar 2016 11:44:09 +0900
>Subject: [PATCH xf86-video-ati] Update pixmap pitch in radeon_set_pixmap_bo
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> src/drmmode_display.c | 11 ++---------
> src/radeon.h          | 10 ++++++++--
> 2 files changed, 10 insertions(+), 11 deletions(-)
>
>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index 7ed8d6c..7331015 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -97,7 +97,6 @@ RADEONZaphodStringMatches(ScrnInfoPtr pScrn, const char *s, char *output_name)
> static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
> 					  int width, int height,
> 					  int depth, int bpp,
>-					  int pitch,
> 					  struct radeon_bo *bo, struct radeon_surface *psurf)
> {
> 	RADEONInfoPtr info = RADEONPTR(pScrn);
>@@ -112,7 +111,7 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
> 		return NULL;
> 
> 	if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height,
>-					    depth, bpp, pitch, NULL)) {
>+					    depth, bpp, -1, NULL)) {
> 		return NULL;
> 	}
> 
>@@ -401,8 +400,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmmode,
> 	}
> 
> 	pixmap = drmmode_create_bo_pixmap(pScrn, fbcon->width, fbcon->height,
>-					  fbcon->depth, fbcon->bpp,
>-					  fbcon->pitch, bo, NULL);
>+					  fbcon->depth, fbcon->bpp, bo, NULL);
> 	info->fbcon_pixmap = pixmap;
> 	radeon_bo_unref(bo);
> out_free_fb:
>@@ -577,7 +575,6 @@ drmmode_crtc_scanout_create(xf86CrtcPtr crtc, struct drmmode_scanout *scanout,
> 	ScrnInfoPtr pScrn = crtc->scrn;
> 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
> 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
>-	unsigned long rotate_pitch;
> 
> 	if (scanout->pixmap) {
> 		if (scanout->width == width && scanout->height == height)
>@@ -591,14 +588,10 @@ drmmode_crtc_scanout_create(xf86CrtcPtr crtc, struct drmmode_scanout *scanout,
> 			return NULL;
> 	}
> 
>-	rotate_pitch = RADEON_ALIGN(width, drmmode_get_pitch_align(pScrn, drmmode->cpp, 0))
>-		* drmmode->cpp;
>-
> 	scanout->pixmap = drmmode_create_bo_pixmap(pScrn,
> 						 width, height,
> 						 pScrn->depth,
> 						 pScrn->bitsPerPixel,
>-						 rotate_pitch,
> 						 scanout->bo, NULL);
> 	if (scanout->pixmap == NULL)
> 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>diff --git a/src/radeon.h b/src/radeon.h
>index 37d5fb6..011b66b 100644
>--- a/src/radeon.h
>+++ b/src/radeon.h
>@@ -656,6 +656,8 @@ uint32_t radeon_get_pixmap_tiling(PixmapPtr pPix);
> 
> static inline void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo)
> {
>+    ScreenPtr pScreen = pPix->drawable.pScreen;
>+
> #ifdef USE_GLAMOR
>     RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
> 
>@@ -691,7 +693,9 @@ static inline void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo)
> 	    radeon_bo_ref(bo);
> 	    priv->bo = bo;
> 
>-	    radeon_bo_get_tiling(bo, &priv->tiling_flags, &pitch);
>+	    if (radeon_bo_get_tiling(bo, &priv->tiling_flags, &pitch) == 0 &&
>+		pitch != pPix->devKind)
>+		pScreen->ModifyPixmapHeader(pPix, -1, -1, -1, -1, pitch, NULL);
> 	}
> out:
> 	radeon_set_pixmap_private(pPix, priv);
>@@ -710,7 +714,9 @@ out:
> 	    radeon_bo_ref(bo);
> 	    driver_priv->bo = bo;
> 
>-	    radeon_bo_get_tiling(bo, &driver_priv->tiling_flags, &pitch);
>+	    if (radeon_bo_get_tiling(bo, &driver_priv->tiling_flags, &pitch) == 0 &&
>+		pitch != pPix->devKind)
>+		pScreen->ModifyPixmapHeader(pPix, -1, -1, -1, -1, pitch, NULL);
> 	}
>     }
> }
>-- 
>2.8.0.rc3
>

Actions: View | Splinter Review

Attachments on bug 94751: 122630

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.