From 6517accf7efb2f0ba0030f38252fe9d7b309e855 Mon Sep 17 00:00:00 2001 From: Leandro Ribeiro Date: Mon, 30 May 2022 18:33:08 -0300 Subject: [PATCH] backend-drm: cosmetic changes to dmabuf_feedback_maybe_update() Cosmetic changes that makes dmabuf_feedback_maybe_update() easier to read. Signed-off-by: Leandro Ribeiro --- libweston/backend-drm/state-propose.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/libweston/backend-drm/state-propose.c b/libweston/backend-drm/state-propose.c index 348fb907e..7cd7714c0 100644 --- a/libweston/backend-drm/state-propose.c +++ b/libweston/backend-drm/state-propose.c @@ -348,6 +348,20 @@ dmabuf_feedback_maybe_update(struct drm_device *device, struct weston_view *ev, struct timespec current_time, delta_time; const time_t MAX_TIME_SECONDS = 2; + /* Look for scanout tranche. If not found, add it but in disabled mode + * (we still don't know if we'll have to send it to clients). This + * simplifies the code. */ + scanout_tranche = + weston_dmabuf_feedback_find_tranche(dmabuf_feedback, scanout_dev, + scanout_flags, SCANOUT_PREF); + if (!scanout_tranche) { + scanout_tranche = + weston_dmabuf_feedback_tranche_create(dmabuf_feedback, + b->compositor->dmabuf_feedback_format_table, + scanout_dev, scanout_flags, SCANOUT_PREF); + scanout_tranche->active = false; + } + /* Direct scanout won't happen even if client re-allocates using * params from the scanout tranche, so keep only the renderer tranche. */ if (try_view_on_plane_failure_reasons & (FAILURE_REASONS_FORCE_RENDERER | @@ -366,27 +380,10 @@ dmabuf_feedback_maybe_update(struct drm_device *device, struct weston_view *ev, action_needed = ACTION_NEEDED_ADD_SCANOUT_TRANCHE; } - /* Look for scanout tranche. If not found, add it but in disabled mode - * (we still don't know if we'll have to send it to clients). This - * simplifies the code. */ - scanout_tranche = - weston_dmabuf_feedback_find_tranche(dmabuf_feedback, scanout_dev, - scanout_flags, SCANOUT_PREF); - if (!scanout_tranche) { - scanout_tranche = - weston_dmabuf_feedback_tranche_create(dmabuf_feedback, - b->compositor->dmabuf_feedback_format_table, - scanout_dev, scanout_flags, - SCANOUT_PREF); - scanout_tranche->active = false; - } - /* No actions needed, so disarm timer and return */ if (action_needed == ACTION_NEEDED_NONE || - (action_needed == ACTION_NEEDED_ADD_SCANOUT_TRANCHE && - scanout_tranche->active) || - (action_needed == ACTION_NEEDED_REMOVE_SCANOUT_TRANCHE && - !scanout_tranche->active)) { + (action_needed == ACTION_NEEDED_ADD_SCANOUT_TRANCHE && scanout_tranche->active) || + (action_needed == ACTION_NEEDED_REMOVE_SCANOUT_TRANCHE && !scanout_tranche->active)) { dmabuf_feedback->action_needed = ACTION_NEEDED_NONE; return; }