backend-drm: Move cursors_are_broken test earlier

No point trying to place a cursor buffer on a plane when we can't do
cursor planes.

Signed-off-by: Daniel Stone <daniels@collabora.com>
dev
Daniel Stone 3 years ago
parent e5ad3c8865
commit ae60745b61
  1. 7
      libweston/backend-drm/state-propose.c

@ -406,11 +406,6 @@ drm_output_try_view_on_plane(struct drm_plane *plane,
switch (plane->type) { switch (plane->type) {
case WDRM_PLANE_TYPE_CURSOR: case WDRM_PLANE_TYPE_CURSOR:
if (b->cursors_are_broken) {
availability = NO_PLANES_ACCEPTED;
goto out;
}
ps = drm_output_prepare_cursor_view(state, ev, zpos); ps = drm_output_prepare_cursor_view(state, ev, zpos);
if (ps) if (ps)
availability = PLACED_ON_PLANE; availability = PLACED_ON_PLANE;
@ -646,7 +641,7 @@ drm_output_prepare_plane_view(struct drm_output_state *state,
buffer = ev->surface->buffer_ref.buffer; buffer = ev->surface->buffer_ref.buffer;
shmbuf = wl_shm_buffer_get(buffer->resource); shmbuf = wl_shm_buffer_get(buffer->resource);
if (shmbuf) { if (shmbuf) {
if (!output->cursor_plane) if (!output->cursor_plane || b->cursors_are_broken)
return NULL; return NULL;
if (wl_shm_buffer_get_format(shmbuf) != WL_SHM_FORMAT_ARGB8888) { if (wl_shm_buffer_get_format(shmbuf) != WL_SHM_FORMAT_ARGB8888) {

Loading…
Cancel
Save