drm/i915: rename vlv_get_hpll_vco() to vlv_clock_get_hpll_vco()

Follow the new vlv_clock_*() naming pattern for all the related VLV
clock functions.

v2: Rebase

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/75ac6b1cda2cb0afe3171250c4d5ba1ff81df877.1757688216.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 6ea44bec4da572d18569d8afe118458f4513c7c5..ea1e6d9647645772bcf7667cc7455e5c5c4b2884 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -608,7 +608,7 @@ static void vlv_get_cdclk(struct intel_display *display,
 {
        u32 val;
 
-       cdclk_config->vco = vlv_get_hpll_vco(display->drm);
+       cdclk_config->vco = vlv_clock_get_hpll_vco(display->drm);
        cdclk_config->cdclk = vlv_clock_get_cdclk(display->drm);
 
        vlv_punit_get(display->drm);

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 462771435c4b40c139395f2973f3590563c39941..022f32ffd6973a11bc2cd6a4405c94a6d64364be 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -142,7 +142,7 @@ static void bdw_set_pipe_misc(struct intel_dsb *dsb,
                              const struct intel_crtc_state *crtc_state);
 
 /* returns HPLL frequency in kHz */
-int vlv_get_hpll_vco(struct drm_device *drm)
+int vlv_clock_get_hpll_vco(struct drm_device *drm)
 {
        int hpll_freq, vco_freq[] = { 800, 1600, 2000, 2400 };
 
@@ -183,7 +183,7 @@ static int vlv_get_cck_clock_hpll(struct drm_device *drm,
        int hpll;
 
        if (dev_priv->hpll_freq == 0)
-               dev_priv->hpll_freq = vlv_get_hpll_vco(drm);
+               dev_priv->hpll_freq = vlv_clock_get_hpll_vco(drm);
 
        hpll = vlv_get_cck_clock(drm, name, reg, dev_priv->hpll_freq);
 
@@ -210,7 +210,7 @@ int vlv_clock_get_czclk(struct drm_device *drm)
 int vlv_clock_get_cdclk(struct drm_device *drm)
 {
        return vlv_get_cck_clock(drm, "cdclk", CCK_DISPLAY_CLOCK_CONTROL,
-                                vlv_get_hpll_vco(drm));
+                                vlv_clock_get_hpll_vco(drm));
 }
 
 int vlv_clock_get_gpll(struct drm_device *drm)

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 57b06cad314b48dad2d06a601375218e1a9ac26a..5c406b276a766cea1365c4e07c2d8da4e2a29fc5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -435,7 +435,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);
 void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state);
 void i830_enable_pipe(struct intel_display *display, enum pipe pipe);
 void i830_disable_pipe(struct intel_display *display, enum pipe pipe);
-int vlv_get_hpll_vco(struct drm_device *drm);
+int vlv_clock_get_hpll_vco(struct drm_device *drm);
 int vlv_clock_get_hrawclk(struct drm_device *drm);
 int vlv_clock_get_czclk(struct drm_device *drm);
 int vlv_clock_get_cdclk(struct drm_device *drm);