XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-03-24 01:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

glamor: Fix amdgpu_glamor_share_pixmap_backing for priv->bo == NULL

Browse Source 
Fixes crash when running a compositor and DRI_PRIME client via DRI2.

Reported-by: Qiang Yu <qiang.yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit b36c77695b)
This commit is contained in:
Michel Dänzer
2016-09-14 16:42:39 +09:00
committed by Michel Dänzer
parent 0d5b6957ae
commit 0af88ed18a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amdgpu_glamor.c
View File

@@ -278,12 +278,17 @@ static Bool
amdgpu_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
void **handle_p)
{
struct amdgpu_pixmap *priv = amdgpu_get_pixmap_private(pixmap);
ScreenPtr screen = pixmap->drawable.pScreen;
CARD16 stride;
CARD32 size;
int fd;
if (!priv)
fd = glamor_fd_from_pixmap(screen, pixmap, &stride, &size);
if (fd < 0)
return FALSE;
return amdgpu_share_pixmap_backing(priv->bo, handle_p);
*handle_p = (void *)(long)fd;
return TRUE;
}
static Bool