Skip to content

Commit 189fd01

Browse files
committed
wayland/dma-buf: Handle failing to import scanout DMA buffer
1 parent 0bc1419 commit 189fd01

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/wayland/meta-wayland-dma-buf.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ meta_wayland_dma_buf_buffer_attach (MetaWaylandBuffer *buffer,
191191

192192
#ifdef HAVE_NATIVE_BACKEND
193193
static struct gbm_bo *
194-
create_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf,
195-
MetaGpuKms *gpu_kms,
196-
int n_planes,
197-
gboolean *use_modifier)
194+
import_scanout_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf,
195+
MetaGpuKms *gpu_kms,
196+
int n_planes,
197+
gboolean *use_modifier)
198198
{
199199
struct gbm_device *gbm_device;
200200

@@ -282,7 +282,12 @@ meta_wayland_dma_buf_try_acquire_scanout (MetaWaylandDmaBufBuffer *dma_buf,
282282
return NULL;
283283

284284
gpu_kms = meta_renderer_native_get_primary_gpu (renderer_native);
285-
gbm_bo = create_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier);
285+
gbm_bo = import_scanout_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier);
286+
if (!gbm_bo)
287+
{
288+
g_debug ("Failed to import scanout gbm_bo: %s", g_strerror (errno));
289+
return NULL;
290+
}
286291

287292
fb = meta_drm_buffer_gbm_new_take (gpu_kms, gbm_bo,
288293
use_modifier,

0 commit comments

Comments
 (0)