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

backend-drm: Assign the primary plane the lowest zpos value

Browse Source 
when switching to mixed-mode of compositing

This way we avoid an (incorrect) duplicate check of zpos values. Also,
this would be needed because the renderer needs have the lowest zpos value
available as we don't (yet) properly support underlays, the primary
plane serves as our renderer.

Adds also a check to see if we try to assign a view to a plane with
a lower zpos value than the one assigned to the primary when switching
to mixed-mode of compositing.

Fixes: #304

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2019-11-15 13:33:38 +02:00
parent b544ac3ab4
commit bd002b9884
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libweston/backend-drm/state-propose.c
View File

@ -636,6 +636,7 @@ static struct drm_plane_state *
drm_output_prepare_plane_view(struct drm_output_state *state, drm_output_prepare_plane_view(struct drm_output_state *state,
struct weston_view *ev, struct weston_view *ev,
enum drm_output_propose_state_mode mode, enum drm_output_propose_state_mode mode,
struct drm_plane_state *scanout_state,
uint64_t current_lowest_zpos) uint64_t current_lowest_zpos)
{ {
struct drm_output *output = state->output; struct drm_output *output = state->output;
@ -677,6 +678,19 @@ drm_output_prepare_plane_view(struct drm_output_state *state,
continue; continue;
} }
if (mode == DRM_OUTPUT_PROPOSE_STATE_MIXED) {
assert(scanout_state != NULL);
if (scanout_state->zpos >= plane->zpos_max) {
drm_debug(b, "\t\t\t\t[plane] not adding plane %d to "
"candidate list: primary's zpos "
"value (%"PRIu64") higher than "
"plane's maximum value (%"PRIu64")\n",
plane->plane_id, scanout_state->zpos,
plane->zpos_max);
continue;
}
}
if (!drm_output_plane_view_has_valid_format(plane, state, ev, fb)) { if (!drm_output_plane_view_has_valid_format(plane, state, ev, fb)) {
drm_debug(b, "\t\t\t\t[plane] not adding plane %d to " drm_debug(b, "\t\t\t\t[plane] not adding plane %d to "
"candidate list: invalid pixel format\n", "candidate list: invalid pixel format\n",
@ -786,10 +800,14 @@ drm_output_propose_state(struct weston_output *output_base,
scanout_state = drm_plane_state_duplicate(state, scanout_state = drm_plane_state_duplicate(state,
plane->state_cur); plane->state_cur);
/* assign the primary primary the lowest zpos value */
scanout_state->zpos = plane->zpos_min;
drm_debug(b, "\t\t[state] using renderer FB ID %lu for mixed " drm_debug(b, "\t\t[state] using renderer FB ID %lu for mixed "
"mode for output %s (%lu)\n", "mode for output %s (%lu)\n",
(unsigned long) scanout_fb->fb_id, output->base.name, (unsigned long) scanout_fb->fb_id, output->base.name,
(unsigned long) output->base.id); (unsigned long) output->base.id);
drm_debug(b, "\t\t[state] scanout will use for zpos %"PRIu64"\n",
scanout_state->zpos);
} }
/* - renderer_region contains the total region which which will be /* - renderer_region contains the total region which which will be
@ -887,6 +905,7 @@ drm_output_propose_state(struct weston_output *output_base,
drm_debug(b, "\t\t\t[plane] started with zpos %"PRIu64"\n", drm_debug(b, "\t\t\t[plane] started with zpos %"PRIu64"\n",
current_lowest_zpos); current_lowest_zpos);
ps = drm_output_prepare_plane_view(state, ev, mode, ps = drm_output_prepare_plane_view(state, ev, mode,
scanout_state,
current_lowest_zpos); current_lowest_zpos);
} }