Skip to content

Commit c60db70

Browse files
committed
wayland/dma-buf: Handle failing to import scanout DMA buffer
1 parent e55d0a0 commit c60db70

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

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

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

203203
#ifdef HAVE_NATIVE_BACKEND
204204
static struct gbm_bo *
205-
create_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf,
206-
MetaGpuKms *gpu_kms,
207-
int n_planes,
208-
gboolean *use_modifier)
205+
import_scanout_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf,
206+
MetaGpuKms *gpu_kms,
207+
int n_planes,
208+
gboolean *use_modifier)
209209
{
210210
struct gbm_device *gbm_device;
211211

@@ -293,7 +293,12 @@ meta_wayland_dma_buf_try_acquire_scanout (MetaWaylandDmaBufBuffer *dma_buf,
293293
return NULL;
294294

295295
gpu_kms = meta_renderer_native_get_primary_gpu (renderer_native);
296-
gbm_bo = create_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier);
296+
gbm_bo = import_scanout_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier);
297+
if (!gbm_bo)
298+
{
299+
g_debug ("Failed to import scanout gbm_bo: %s", g_strerror (errno));
300+
return NULL;
301+
}
297302

298303
fb = meta_drm_buffer_gbm_new_take (gpu_kms, gbm_bo,
299304
use_modifier,

0 commit comments

Comments
 (0)