diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-06-08 15:38:57 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-06-08 15:38:57 +0900 |
| commit | b36c77695ba77b59a0ccd868454e3af4fc04d5ff (patch) | |
| tree | 01afaecc3550e2d2c93223e1ab6c994b652afbef | |
| parent | 60ced5026ebc34d9f32c7618430b6a7ef7c8eb4b (diff) | |
glamor: Fix amdgpu_glamor_share_pixmap_backing for priv->bo == NULL
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>
| -rw-r--r-- | src/amdgpu_glamor.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c index 52aa30d..b6ec98f 100644 --- a/src/amdgpu_glamor.c +++ b/src/amdgpu_glamor.c @@ -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 |