From cc2555835cd4c5fd2ae4f999a4bf7c18cdb1dda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 12 Sep 2016 18:26:57 +0900 Subject: glamor: Reallocate linear pixmap BO if necessary for DRI2 PRIME Fixes corruption when using DRI2 PRIME render offloading with the master screen using this driver. (Ported from amdgpu commit 0007c2f018ba663303d91d847e7c085269a23062) Reviewed-by: Alex Deucher --- src/radeon_glamor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src') diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index f46e8bad..7a6bf534 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -342,6 +342,26 @@ radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, CARD32 size; int fd; + if ((radeon_get_pixmap_tiling_flags(pixmap) & + RADEON_TILING_MASK) != RADEON_TILING_LINEAR) { + PixmapPtr linear; + + /* We don't want to re-allocate the screen pixmap as + * linear, to avoid trouble with page flipping + */ + if (screen->GetScreenPixmap(screen) == pixmap) + return FALSE; + + linear = screen->CreatePixmap(screen, pixmap->drawable.width, + pixmap->drawable.height, + pixmap->drawable.depth, + CREATE_PIXMAP_USAGE_SHARED); + if (!linear) + return FALSE; + + radeon_glamor_set_pixmap_bo(&pixmap->drawable, linear); + } + fd = glamor_fd_from_pixmap(screen, pixmap, &stride, &size); if (fd < 0) return FALSE; -- cgit v1.2.3