OSDN Git Service

Revert "drm/vc4: hdmi: Enforce the minimum rate at runtime_resume"
authorMaxime Ripard <maxime@cerno.tech>
Thu, 26 Jan 2023 17:05:49 +0000 (18:05 +0100)
committerMaxime Ripard <maxime@cerno.tech>
Thu, 16 Feb 2023 09:24:10 +0000 (10:24 +0100)
This reverts commit ae71ab585c819f83aec84f91eb01157a90552ef2.

Commit ae71ab585c81 ("drm/vc4: hdmi: Enforce the minimum rate at
runtime_resume") was introduced to work around an issue partly due to
the clk-bcm2835 driver on the RaspberryPi0-3.

Since we're not using that driver for our HDMI clocks, we can now revert
it.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20230126-rpi-display-fw-clk-cleanup-v1-4-d646ff6fb842@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
drivers/gpu/drm/vc4/vc4_hdmi.c

index e82fe17..18d84aa 100644 (file)
@@ -3350,15 +3350,6 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
        unsigned long rate;
        int ret;
 
-       /*
-        * The HSM clock is in the HDMI power domain, so we need to set
-        * its frequency while the power domain is active so that it
-        * keeps its rate.
-        */
-       ret = clk_set_min_rate(vc4_hdmi->hsm_clock, HSM_MIN_CLOCK_FREQ);
-       if (ret)
-               return ret;
-
        ret = clk_prepare_enable(vc4_hdmi->hsm_clock);
        if (ret)
                return ret;