drm/tilcdc: Clean up LCDC functional clock rate setting code

Clean up LCDC functional clock rate setting code.

The LCDC functional clock is set by two functions: mode_set_nofb() and
cpufreq_transition().

When tilcdc_crtc_mode_set_nofb() is called in atomic commit phase the
drm atomic helpers have taken all the necessary drm locks and turned
off the crtc, while tilcdc_commit() is keeping LCDC powered on. For
mode_set_nofb() just a simple clock setting function without any
locking or power management code is enough. The new tilcdc_crtc_set_clk()
is implemented for that purpose.

cpufreq_transition() on the other hand is called from outside DRM and
it needs to take the necessary locks and turn off the CRTC while
keeping the LCDC powered. The reimplemented tilcdc_crtc_update_clk()
is for that purpose and it uses the new tilcdc_crtc_set_clk() to
actually set the clock.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index b1ac61eac056..52ff3e120bb9 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -185,14 +185,8 @@ static int cpufreq_transition(struct notifier_block *nb,
         struct tilcdc_drm_private *priv = container_of(nb,
                         struct tilcdc_drm_private, freq_transition);
 
-        if (val == CPUFREQ_POSTCHANGE) {
-                if (priv->lcd_fck_rate != clk_get_rate(priv->clk)) {
-                        drm_modeset_lock_crtc(priv->crtc, NULL);
-                        priv->lcd_fck_rate = clk_get_rate(priv->clk);
-                        tilcdc_crtc_update_clk(priv->crtc);
-                        drm_modeset_unlock_crtc(priv->crtc);
-                }
-        }
+        if (val == CPUFREQ_POSTCHANGE)
+                tilcdc_crtc_update_clk(priv->crtc);
 
         return 0;
 }
@@ -286,7 +280,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags)
         }
 
 #ifdef CONFIG_CPU_FREQ
-        priv->lcd_fck_rate = clk_get_rate(priv->clk);
         priv->freq_transition.notifier_call = cpufreq_transition;
         ret = cpufreq_register_notifier(&priv->freq_transition,
                         CPUFREQ_TRANSITION_NOTIFIER);