fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 09:08:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: log more try_view_on_plane_failure_reasons

Browse source 
Up to now, we've been logging only the failures that we get from
drm_fb_get_from_paint_node(). So let's start logging the other failures
we get in drm_output_find_plane_for_view() as well.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2024-10-08 11:25:37 -03:00
parent 5c3067ad54
commit eabc19bc3b
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libweston/backend-drm/drm-internal.h
View file

@ -802,7 +802,8 @@ wdrm_colorspace_from_output(struct weston_output *output);
#ifdef BUILD_DRM_GBM
extern struct drm_fb *
drm_fb_get_from_paint_node(struct drm_output_state *state,
struct weston_paint_node *pnode);
struct weston_paint_node *pnode,
uint32_t *try_view_on_plane_failure_reasons);
extern bool
drm_can_scanout_dmabuf(struct weston_backend *backend,
@ -810,7 +811,8 @@ drm_can_scanout_dmabuf(struct weston_backend *backend,
#else
static inline struct drm_fb *
drm_fb_get_from_paint_node(struct drm_output_state *state,
struct weston_paint_node *pnode)
struct weston_paint_node *pnode,
uint32_t *try_view_on_plane_failure_reasons)
{
return NULL;
}

17
libweston/backend-drm/fb.c
View file

@ -674,7 +674,8 @@ drm_fb_handle_buffer_destroy(struct wl_listener *listener, void *data)
struct drm_fb *
drm_fb_get_from_paint_node(struct drm_output_state *state,
struct weston_paint_node *pnode)
struct weston_paint_node *pnode,
uint32_t *try_view_on_plane_failure_reasons)
{
struct drm_output *output = state->output;
struct drm_backend *b = output->backend;
@ -689,13 +690,13 @@ drm_fb_get_from_paint_node(struct drm_output_state *state,
if (ev->surface->protection_mode == WESTON_SURFACE_PROTECTION_MODE_ENFORCED &&
ev->surface->desired_protection > output->base.current_protection) {
pnode->try_view_on_plane_failure_reasons |=
*try_view_on_plane_failure_reasons |=
FAILURE_REASONS_INADEQUATE_CONTENT_PROTECTION;
return NULL;
}
if (!buffer) {
pnode->try_view_on_plane_failure_reasons |= FAILURE_REASONS_NO_BUFFER;
*try_view_on_plane_failure_reasons |= FAILURE_REASONS_NO_BUFFER;
return NULL;
}
@ -711,7 +712,7 @@ drm_fb_get_from_paint_node(struct drm_output_state *state,
wl_list_for_each(buf_fb, &private->buffer_fb_list, link) {
if (buf_fb->device == device) {
pnode->try_view_on_plane_failure_reasons |= buf_fb->failure_reasons;
*try_view_on_plane_failure_reasons |= buf_fb->failure_reasons;
return buf_fb->fb ? drm_fb_ref(buf_fb->fb) : NULL;
}
}
@ -722,7 +723,7 @@ drm_fb_get_from_paint_node(struct drm_output_state *state,
/* GBM is used for dmabuf import as well as from client wl_buffer. */
if (!b->gbm) {
pnode->try_view_on_plane_failure_reasons |= FAILURE_REASONS_NO_GBM;
*try_view_on_plane_failure_reasons |= FAILURE_REASONS_NO_GBM;
goto unsuitable;
}
@ -741,13 +742,13 @@ drm_fb_get_from_paint_node(struct drm_output_state *state,
fb = drm_fb_get_from_bo(bo, device, is_opaque, BUFFER_CLIENT);
if (!fb) {
pnode->try_view_on_plane_failure_reasons |=
*try_view_on_plane_failure_reasons |=
FAILURE_REASONS_ADD_FB_FAILED;
gbm_bo_destroy(bo);
goto unsuitable;
}
} else {
pnode->try_view_on_plane_failure_reasons |= FAILURE_REASONS_BUFFER_TYPE;
*try_view_on_plane_failure_reasons |= FAILURE_REASONS_BUFFER_TYPE;
goto unsuitable;
}
@ -776,7 +777,7 @@ drm_fb_get_from_paint_node(struct drm_output_state *state,
return fb;
unsuitable:
pnode->try_view_on_plane_failure_reasons |= buf_fb->failure_reasons;
*try_view_on_plane_failure_reasons |= buf_fb->failure_reasons;
return NULL;
}
#endif

13
libweston/backend-drm/state-propose.c
View file

@ -456,6 +456,7 @@ drm_output_find_plane_for_view(struct drm_output_state *state,
bool view_matches_entire_output, scanout_has_view_assigned;
uint32_t possible_plane_mask = 0;
uint32_t fb_failure_reasons = 0;
bool any_candidate_picked = false;
pnode->try_view_on_plane_failure_reasons = FAILURE_REASONS_NONE;
@ -521,15 +522,15 @@ drm_output_find_plane_for_view(struct drm_output_state *state,
pnode->try_view_on_plane_failure_reasons |=
FAILURE_REASONS_INCOMPATIBLE_TRANSFORM;
fb = drm_fb_get_from_paint_node(state, pnode);
fb = drm_fb_get_from_paint_node(state, pnode, &fb_failure_reasons);
if (fb) {
possible_plane_mask &= fb->plane_mask;
} else {
char *fr_str = bits_to_str(pnode->try_view_on_plane_failure_reasons,
failure_reasons_to_str);
char *fr_str = bits_to_str(fb_failure_reasons, failure_reasons_to_str);
weston_assert_ptr(b->compositor, fr_str);
drm_debug(b, "\t\t\t[view] couldn't get FB for view: %s\n", fr_str);
free(fr_str);
pnode->try_view_on_plane_failure_reasons |= fb_failure_reasons;
}
}
@ -949,8 +950,12 @@ drm_output_propose_state(struct weston_output *output_base,
pixman_region32_fini(&clipped_view);
goto err_region;
} else if (!ps) {
char *fr_str = bits_to_str(pnode->try_view_on_plane_failure_reasons,
failure_reasons_to_str);
weston_assert_ptr(b->compositor, fr_str);
drm_debug(b, "\t\t\t\t[view] view %p will be placed "
"on the renderer\n", ev);
"on the renderer: %s\n", ev, fr_str);
free(fr_str);
}
if (!ps || drm_mixed_mode_check_underlay(mode, scanout_state, ps->zpos)) {