From eef8b3dde8cda28a97ad36a602554e0ecf9819dd Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 14 Aug 2020 12:04:29 +0200 Subject: [PATCH] backend/drm: check drm_surface_render_black_frame return value This avoids hitting an assertion in drm_fb_lock_surface when we failed to render a black frame. --- backend/drm/drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 95f8c3d0..dd3e9c71 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -681,7 +681,9 @@ static bool drm_connector_pageflip_renderer(struct wlr_drm_connector *conn) { // drm_crtc_page_flip expects a FB to be available struct wlr_drm_plane *plane = crtc->primary; if (!plane_get_next_fb(plane)->bo) { - drm_surface_render_black_frame(&plane->surf); + if (!drm_surface_render_black_frame(&plane->surf)) { + return false; + } if (!drm_fb_lock_surface(&plane->pending_fb, &plane->surf)) { return false; }