| Message ID | 20220815-rpi-fix-4k-60-v4-7-a1b40526df3e@cerno.tech (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: Fix the core clock behaviour | expand |
On Thu, 20 Oct 2022 at 10:14, <maxime@cerno.tech> wrote: > > Following the clock rate range improvements to the clock framework, > trying to set a disjoint range on a clock will now result in an error. > > Thus, we can't set a minimum rate higher than the maximum reported by > the firmware, or clk_set_min_rate() will fail. > > Thus we need to clamp the rate we are about to ask for to the maximum > rate possible on that clock. > > Signed-off-by: Maxime Ripard <maxime@cerno.tech> Thanks Maxime. Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com> > --- > drivers/gpu/drm/vc4/vc4_kms.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c > index 4419e810103d..5c97642ed66a 100644 > --- a/drivers/gpu/drm/vc4/vc4_kms.c > +++ b/drivers/gpu/drm/vc4/vc4_kms.c > @@ -396,8 +396,8 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) > if (vc4->is_vc5) { > unsigned long state_rate = max(old_hvs_state->core_clock_rate, > new_hvs_state->core_clock_rate); > - unsigned long core_rate = max_t(unsigned long, > - 500000000, state_rate); > + unsigned long core_rate = clamp_t(unsigned long, state_rate, > + 500000000, hvs->max_core_rate); > > drm_dbg(dev, "Raising the core clock at %lu Hz\n", core_rate); > > @@ -431,14 +431,17 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) > drm_atomic_helper_cleanup_planes(dev, state); > > if (vc4->is_vc5) { > - drm_dbg(dev, "Running the core clock at %lu Hz\n", > - new_hvs_state->core_clock_rate); > + unsigned long core_rate = min_t(unsigned long, > + hvs->max_core_rate, > + new_hvs_state->core_clock_rate); > + > + drm_dbg(dev, "Running the core clock at %lu Hz\n", core_rate); > > /* > * Request a clock rate based on the current HVS > * requirements. > */ > - WARN_ON(clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate)); > + WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate)); > > drm_dbg(dev, "Core clock actual rate: %lu Hz\n", > clk_get_rate(hvs->core_clk)); > > -- > b4 0.10.1
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 4419e810103d..5c97642ed66a 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -396,8 +396,8 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) if (vc4->is_vc5) { unsigned long state_rate = max(old_hvs_state->core_clock_rate, new_hvs_state->core_clock_rate); - unsigned long core_rate = max_t(unsigned long, - 500000000, state_rate); + unsigned long core_rate = clamp_t(unsigned long, state_rate, + 500000000, hvs->max_core_rate); drm_dbg(dev, "Raising the core clock at %lu Hz\n", core_rate); @@ -431,14 +431,17 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state) drm_atomic_helper_cleanup_planes(dev, state); if (vc4->is_vc5) { - drm_dbg(dev, "Running the core clock at %lu Hz\n", - new_hvs_state->core_clock_rate); + unsigned long core_rate = min_t(unsigned long, + hvs->max_core_rate, + new_hvs_state->core_clock_rate); + + drm_dbg(dev, "Running the core clock at %lu Hz\n", core_rate); /* * Request a clock rate based on the current HVS * requirements. */ - WARN_ON(clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate)); + WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate)); drm_dbg(dev, "Core clock actual rate: %lu Hz\n", clk_get_rate(hvs->core_clk));
Following the clock rate range improvements to the clock framework, trying to set a disjoint range on a clock will now result in an error. Thus, we can't set a minimum rate higher than the maximum reported by the firmware, or clk_set_min_rate() will fail. Thus we need to clamp the rate we are about to ask for to the maximum rate possible on that clock. Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/vc4/vc4_kms.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)