diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h index 6118e1a72..079a68952 100644 --- a/libweston/backend-drm/drm-internal.h +++ b/libweston/backend-drm/drm-internal.h @@ -163,11 +163,12 @@ enum try_view_on_plane_failure_reasons { FAILURE_REASONS_INADEQUATE_CONTENT_PROTECTION = 1 << 6, FAILURE_REASONS_INCOMPATIBLE_TRANSFORM = 1 << 7, FAILURE_REASONS_NO_BUFFER = 1 << 8, - FAILURE_REASONS_BUFFER_TYPE = 1 << 9, - FAILURE_REASONS_GLOBAL_ALPHA = 1 << 10, - FAILURE_REASONS_NO_GBM = 1 << 11, - FAILURE_REASONS_GBM_BO_IMPORT_FAILED = 1 << 12, - FAILURE_REASONS_GBM_BO_GET_HANDLE_FAILED = 1 << 13, + FAILURE_REASONS_BUFFER_TOO_BIG = 1 << 9, + FAILURE_REASONS_BUFFER_TYPE = 1 << 10, + FAILURE_REASONS_GLOBAL_ALPHA = 1 << 11, + FAILURE_REASONS_NO_GBM = 1 << 12, + FAILURE_REASONS_GBM_BO_IMPORT_FAILED = 1 << 13, + FAILURE_REASONS_GBM_BO_GET_HANDLE_FAILED = 1 << 14, }; /** diff --git a/libweston/backend-drm/state-propose.c b/libweston/backend-drm/state-propose.c index 6c8d5ce80..5cfa9534f 100644 --- a/libweston/backend-drm/state-propose.c +++ b/libweston/backend-drm/state-propose.c @@ -419,7 +419,7 @@ drm_output_find_plane_for_view(struct drm_output_state *state, /* check view for valid buffer, doesn't make sense to even try */ if (!weston_view_has_valid_buffer(ev)) { pnode->try_view_on_plane_failure_reasons |= - FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; + FAILURE_REASONS_NO_BUFFER; return NULL; } @@ -431,12 +431,12 @@ drm_output_find_plane_for_view(struct drm_output_state *state, buffer = ev->surface->buffer_ref.buffer; if (buffer->type == WESTON_BUFFER_SOLID) { pnode->try_view_on_plane_failure_reasons |= - FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; + FAILURE_REASONS_BUFFER_TYPE; return NULL; } else if (buffer->type == WESTON_BUFFER_SHM) { if (!output->cursor_plane || device->cursors_are_broken) { pnode->try_view_on_plane_failure_reasons |= - FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; + FAILURE_REASONS_BUFFER_TYPE; return NULL; } @@ -457,7 +457,7 @@ drm_output_find_plane_for_view(struct drm_output_state *state, "(buffer (%dx%d) too large for cursor plane)\n", ev, buffer->width, buffer->height); pnode->try_view_on_plane_failure_reasons |= - FAILURE_REASONS_FB_FORMAT_INCOMPATIBLE; + FAILURE_REASONS_BUFFER_TOO_BIG; return NULL; }