Skip to content

Commit

Permalink
drm/vc4: kms: Use maximum FIFO load for the HVS clock rate
Browse files Browse the repository at this point in the history
The core clock computation takes into account both the load due to the
input (ie, planes) and its output (ie, encoders).

However, while the input load needs to consider all the planes, and thus
sum all of their associated loads, the output happens mostly in
parallel.

Therefore, we need to consider only the maximum of all the output loads,
and not the sum like we were doing. This resulted in a clock rate way
too high which could be discarded for being too high by the clock
framework.

Since recent changes, the clock framework will even downright reject it,
leading to a core clock being too low for its current needs.

Fixes: 16e1010 ("drm/vc4: Increase the core clock based on HVS load")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20220613144800.326124-4-maxime@cerno.tech
  • Loading branch information
Maxime Ripard committed Jun 28, 2022
1 parent 7d0648c commit 1701a23
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/vc4/vc4_kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,9 @@ vc4_core_clock_atomic_check(struct drm_atomic_state *state)
continue;

num_outputs++;
cob_rate += hvs_new_state->fifo_state[i].fifo_load;
cob_rate = max_t(unsigned long,
hvs_new_state->fifo_state[i].fifo_load,
cob_rate);
}

pixel_rate = load_state->hvs_load;
Expand Down

0 comments on commit 1701a23

Please sign in to comment.