compositor-drm: Reshuffle drm_output_render
Call drm_output_render unconditionally, doing an early exit if we're
already rendering a client buffer on the primary plane.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 44c2105..835c9ca 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -752,6 +752,11 @@
struct weston_compositor *c = output->base.compositor;
struct drm_backend *b = to_drm_backend(c);
+ /* If we already have a client buffer promoted to scanout, then we don't
+ * want to render. */
+ if (output->fb_pending)
+ return;
+
if (b->use_pixman)
drm_output_render_pixman(output, damage);
else
@@ -823,8 +828,7 @@
if (output->disable_pending || output->destroy_pending)
return -1;
- if (!output->fb_pending)
- drm_output_render(output, damage);
+ drm_output_render(output, damage);
if (!output->fb_pending)
return -1;