openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 10:19:00 +00:00
Code Issues Projects Releases Wiki Activity

backport commits to not crash when accel is disabled

Browse Source 
cb27a5b Handle NULL fb_ptr in pixmap_get_fb
e2cd67a Bail from amdgpu_pixmap_get_handle with ShadowFB
This commit is contained in:
jsg
2020-10-26 14:15:50 +00:00
parent a76b9a7e41
commit 49df366b19
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
driver/xf86-video-amdgpu/src/amdgpu_bo_helper.c
View File

@@ -185,13 +185,15 @@ uint64_t amdgpu_pixmap_get_tiling_info(PixmapPtr pixmap)
Bool amdgpu_pixmap_get_handle(PixmapPtr pixmap, uint32_t *handle)
{
#ifdef USE_GLAMOR
ScreenPtr screen = pixmap->drawable.pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
AMDGPUInfoPtr info = AMDGPUPTR(scrn);
#endif
struct amdgpu_pixmap *priv = amdgpu_get_pixmap_private(pixmap);
struct amdgpu_pixmap *priv;
if (info->shadow_fb)
return FALSE;
priv = amdgpu_get_pixmap_private(pixmap);
if (!priv) {
priv = calloc(1, sizeof(*priv));
amdgpu_set_pixmap_private(pixmap, priv);

2
driver/xf86-video-amdgpu/src/amdgpu_pixmap.h
View File

@@ -162,7 +162,7 @@ amdgpu_pixmap_get_fb(PixmapPtr pix)
handle);
}
return *fb_ptr;
return fb_ptr ? *fb_ptr : NULL;
}
enum {