mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Return FB directly from render

Browse Source 
Instead of setting state members directly in the drm_output_render
functions (to paint using Pixman or GL), just return a drm_fb, and let
the core function place it in state.

This brings damage handling in line with repaint state, so we do not
clear damage if repaint fails.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Daniel Stone
2017-04-04 17:54:30 +01:00
committed by Pekka Paalanen
parent 4e84f7dd32
commit 95d48a2a88
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+19 -11
View File
@@ -695,11 +695,12 @@ drm_output_prepare_scanout_view(struct drm_output *output,
return &output->fb_plane; return &output->fb_plane;
} }
static void static struct drm_fb *
drm_output_render_gl(struct drm_output *output, pixman_region32_t *damage) drm_output_render_gl(struct drm_output *output, pixman_region32_t *damage)
{ {
struct drm_backend *b = to_drm_backend(output->base.compositor); struct drm_backend *b = to_drm_backend(output->base.compositor);
struct gbm_bo *bo; struct gbm_bo *bo;
struct drm_fb *ret;
output->base.compositor->renderer->repaint_output(&output->base, output->base.compositor->renderer->repaint_output(&output->base,
damage); damage);
@@ -707,20 +708,21 @@ drm_output_render_gl(struct drm_output *output, pixman_region32_t *damage)
bo = gbm_surface_lock_front_buffer(output->gbm_surface); bo = gbm_surface_lock_front_buffer(output->gbm_surface);
if (!bo) { if (!bo) {
weston_log("failed to lock front buffer: %m\n"); weston_log("failed to lock front buffer: %m\n");
return; return NULL;
} }
output->fb_pending = drm_fb_get_from_bo(bo, b, output->gbm_format, ret = drm_fb_get_from_bo(bo, b, output->gbm_format, BUFFER_GBM_SURFACE);
BUFFER_GBM_SURFACE); if (!ret) {
if (!output->fb_pending) {
weston_log("failed to get drm_fb for bo\n"); weston_log("failed to get drm_fb for bo\n");
gbm_surface_release_buffer(output->gbm_surface, bo); gbm_surface_release_buffer(output->gbm_surface, bo);
return; return NULL;
} }
output->fb_pending->gbm_surface = output->gbm_surface; ret->gbm_surface = output->gbm_surface;
return ret;
} }
static void static struct drm_fb *
drm_output_render_pixman(struct drm_output *output, pixman_region32_t *damage) drm_output_render_pixman(struct drm_output *output, pixman_region32_t *damage)
{ {
struct weston_compositor *ec = output->base.compositor; struct weston_compositor *ec = output->base.compositor;
@@ -736,7 +738,6 @@ drm_output_render_pixman(struct drm_output *output, pixman_region32_t *damage)
output->current_image ^= 1; output->current_image ^= 1;
output->fb_pending = drm_fb_ref(output->dumb[output->current_image]);
pixman_renderer_output_set_buffer(&output->base, pixman_renderer_output_set_buffer(&output->base,
output->image[output->current_image]); output->image[output->current_image]);
@@ -744,6 +745,8 @@ drm_output_render_pixman(struct drm_output *output, pixman_region32_t *damage)
pixman_region32_fini(&total_damage); pixman_region32_fini(&total_damage);
pixman_region32_fini(&previous_damage); pixman_region32_fini(&previous_damage);
return drm_fb_ref(output->dumb[output->current_image]);
} }
static void static void
@@ -751,6 +754,7 @@ drm_output_render(struct drm_output *output, pixman_region32_t *damage)
{ {
struct weston_compositor *c = output->base.compositor; struct weston_compositor *c = output->base.compositor;
struct drm_backend *b = to_drm_backend(c); struct drm_backend *b = to_drm_backend(c);
struct drm_fb *fb;
/* If we already have a client buffer promoted to scanout, then we don't /* If we already have a client buffer promoted to scanout, then we don't
* want to render. */ * want to render. */
@@ -758,9 +762,13 @@ drm_output_render(struct drm_output *output, pixman_region32_t *damage)
return; return;
if (b->use_pixman) if (b->use_pixman)
drm_output_render_pixman(output, damage); fb = drm_output_render_pixman(output, damage);
else else
drm_output_render_gl(output, damage); fb = drm_output_render_gl(output, damage);
if (!fb)
return;
output->fb_pending = fb;
pixman_region32_subtract(&c->primary_plane.damage, pixman_region32_subtract(&c->primary_plane.damage,
&c->primary_plane.damage, damage); &c->primary_plane.damage, damage);