From 66244856e228902b62587c9171374e85c9cf769d Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 7 Dec 2021 16:26:55 +0000 Subject: [PATCH] backend-drm: Don't try to import SHM buffers as drm_fb It won't work. Signed-off-by: Daniel Stone --- libweston/backend-drm/state-propose.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libweston/backend-drm/state-propose.c b/libweston/backend-drm/state-propose.c index 65b230f0..8e355511 100644 --- a/libweston/backend-drm/state-propose.c +++ b/libweston/backend-drm/state-propose.c @@ -681,7 +681,7 @@ drm_output_prepare_plane_view(struct drm_output_state *state, struct weston_buffer *buffer; struct wl_shm_buffer *shmbuf; - struct drm_fb *fb; + struct drm_fb *fb = NULL; wl_list_init(&zpos_candidate_list); @@ -691,7 +691,8 @@ drm_output_prepare_plane_view(struct drm_output_state *state, buffer = ev->surface->buffer_ref.buffer; shmbuf = wl_shm_buffer_get(buffer->resource); - fb = drm_fb_get_from_view(state, ev, try_view_on_plane_failure_reasons); + if (!shmbuf) + fb = drm_fb_get_from_view(state, ev, try_view_on_plane_failure_reasons); if (!shmbuf && !fb) return NULL;