From 635578723e6a95d0658687771f7276c8402b7ea4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 9 Sep 2024 17:28:00 +0100 Subject: [PATCH] drm/vc4: Do not include writeback conn load in load tracker The transposer/writeback connector should be running with a lower priority, so shouldn't be factored into the load calculations. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_kms.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index ea66914ed5ea09..e9144063b67c5b 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -674,17 +674,26 @@ static int vc4_load_tracker_atomic_check(struct drm_atomic_state *state) for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { struct vc4_plane_state *vc4_plane_state; + struct vc4_crtc *vc4_crtc; if (old_plane_state->fb && old_plane_state->crtc) { vc4_plane_state = to_vc4_plane_state(old_plane_state); - load_state->membus_load -= vc4_plane_state->membus_load; - load_state->hvs_load -= vc4_plane_state->hvs_load; + vc4_crtc = to_vc4_crtc(old_plane_state->crtc); + + if (!vc4_crtc->feeds_txp) { + load_state->membus_load -= vc4_plane_state->membus_load; + load_state->hvs_load -= vc4_plane_state->hvs_load; + } } if (new_plane_state->fb && new_plane_state->crtc) { vc4_plane_state = to_vc4_plane_state(new_plane_state); - load_state->membus_load += vc4_plane_state->membus_load; - load_state->hvs_load += vc4_plane_state->hvs_load; + vc4_crtc = to_vc4_crtc(new_plane_state->crtc); + + if (!vc4_crtc->feeds_txp) { + load_state->membus_load += vc4_plane_state->membus_load; + load_state->hvs_load += vc4_plane_state->hvs_load; + } } }