Commit 4e84f7dd authored by Daniel Stone's avatar Daniel Stone Committed by Pekka Paalanen

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's avatarDaniel Stone <>
Reviewed-by: Pekka Paalanen's avatarPekka Paalanen <>
parent 5bb8f58f
......@@ -752,6 +752,11 @@ drm_output_render(struct drm_output *output, pixman_region32_t *damage)
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)
if (b->use_pixman)
drm_output_render_pixman(output, damage);
......@@ -823,8 +828,7 @@ drm_output_repaint(struct weston_output *output_base,
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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment