Skip to contentSkip to conversation

Restore location of radeon_set_pixmap_bo call in drmmode_create_bo_pixmap

PATCH In review Michel Dänzer 2 participants 2 messages Oct 13, 2016 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Restore location of radeon_set_pixmap_bo call in drmmode_create_bo_pixmap

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

radeon_set_pixmap_bo sets the tiling flags, so it needs to be called before radeon_get_pixmap_tiling_flags. Fixes a regression with EXA and TearFree.

Fixes 8523a733b6a5 ("Propagate failure from radeon_set_pixmap_bo")

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98097

---
 src/drmmode_display.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
src/drmmode_display.c +4 -3
index 1b1b3e6..a8054c1 100644
@@ -131,6 +131,10 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 
 	if (!info->use_glamor)
 		exaMoveInPixmap(pixmap);
+
+	if (!radeon_set_pixmap_bo(pixmap, bo))
+		goto fail;
+
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 		surface = radeon_get_pixmap_surface(pixmap);
 		if (surface && psurf) 
@@ -170,9 +174,6 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 		}
 	}
 
-	if (!radeon_set_pixmap_bo(pixmap, bo))
-		goto fail;
-
 	if (!info->use_glamor ||
 	    radeon_glamor_create_textured_pixmap(pixmap,
 						 radeon_get_pixmap_private(pixmap)))
Signature · 6 lines
2.9.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): 20161013073435.7529-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org

Reviewed-by Alex Deucher
#2 lore raw
Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Thursday, October 13, 2016 3:35 AM
To: [email protected]
Subject: [PATCH xf86-video-ati] Restore location of radeon_set_pixmap_bo call in drmmode_create_bo_pixmap

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

Quoted 7 lines

radeon_set_pixmap_bo sets the tiling flags, so it needs to be called before radeon_get_pixmap_tiling_flags. Fixes a regression with EXA and TearFree.

Fixes 8523a733b6a5 ("Propagate failure from radeon_set_pixmap_bo")

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98097

Quoted 31 lines
---
 src/drmmode_display.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
src/drmmode_display.c +4 -0
index 1b1b3e6..a8054c1 100644
@@ -131,6 +131,10 @@ static PixmapPtr
 drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 
 	if (!info->use_glamor)
 		exaMoveInPixmap(pixmap);
+
+	if (!radeon_set_pixmap_bo(pixmap, bo))
+		goto fail;
+
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 		surface = radeon_get_pixmap_surface(pixmap);
src/drmmode_display.c +0 -3
 		if (surface && psurf)
@@ -170,9 +174,6 @@ static PixmapPtr
 drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 		}
 	}
 
-	if (!radeon_set_pixmap_bo(pixmap, bo))
-		goto fail;
-
 	if (!info->use_glamor ||
 	    radeon_glamor_create_textured_pixmap(pixmap,
Quoted 8 lines

radeon_get_pixmap_private(pixmap)))
--
2.9.3

_______________________________________________
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