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

compositor-drm: fix z-order inversion in plane assignment

Browse Source 
As discussed in the following thread:

https://lists.freedesktop.org/archives/wayland-devel/2017-August/034755.html

the existing plane assignment in the DRM backend is vulnerable to
accidental masking of the intended fullscreen surface. This change
adds a simple stateful memory to the plane assignment algorithm
to prevent that.

Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Matt Hoosier 2017-08-24 09:24:20 -05:00 committed by Daniel Stone
parent d4512f6aa1
commit df573031d0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libweston/compositor-drm.c
View File

@ -1869,6 +1869,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
struct weston_view *ev, *next; struct weston_view *ev, *next;
pixman_region32_t overlap, surface_overlap; pixman_region32_t overlap, surface_overlap;
struct weston_plane *primary, *next_plane; struct weston_plane *primary, *next_plane;
bool picked_scanout = false;
/* /*
* Find a surface for each sprite in the output using some heuristics: * Find a surface for each sprite in the output using some heuristics:
@ -1915,14 +1916,23 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
&ev->transform.boundingbox); &ev->transform.boundingbox);
next_plane = NULL; next_plane = NULL;
if (pixman_region32_not_empty(&surface_overlap)) if (pixman_region32_not_empty(&surface_overlap) || picked_scanout)
next_plane = primary; next_plane = primary;
if (next_plane == NULL) if (next_plane == NULL)
next_plane = drm_output_prepare_cursor_view(output, ev); next_plane = drm_output_prepare_cursor_view(output, ev);
if (next_plane == NULL)
/* If a higher-stacked view already got assigned to scanout, it's incorrect to
* assign a subsequent (lower-stacked) view to scanout.
*/
if (next_plane == NULL) {
next_plane = drm_output_prepare_scanout_view(output, ev); next_plane = drm_output_prepare_scanout_view(output, ev);
if (next_plane)
picked_scanout = true;
}
if (next_plane == NULL) if (next_plane == NULL)
next_plane = drm_output_prepare_overlay_view(output, ev); next_plane = drm_output_prepare_overlay_view(output, ev);
if (next_plane == NULL) if (next_plane == NULL)
next_plane = primary; next_plane = primary;