[CI v2 14/16] drm/i915/cdclk: abstract intel_cdclk_read_hw()

[Jani Nikula]

Add intel_cdclk_read_hw() function to avoid looking at struct
intel_cdclk_state internals outside of intel_cdclk.c.

intel_cdclk_init_hw() would be a better name, but we already have that.

Reviewed-by: Imre Deak <imre.d...@intel.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c          | 12 ++++++++++++
 drivers/gpu/drm/i915/display/intel_cdclk.h          |  1 +
 drivers/gpu/drm/i915/display/intel_display_driver.c |  8 +-------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c 
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 0c2d0195a2d9..156b5b5190cc 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3869,3 +3869,15 @@ void intel_cdclk_force_min_cdclk(struct 
intel_cdclk_state *cdclk_state, int forc
 {
        cdclk_state->force_min_cdclk = force_min_cdclk;
 }
+
+void intel_cdclk_read_hw(struct intel_display *display)
+{
+       struct intel_cdclk_state *cdclk_state;
+
+       cdclk_state = to_intel_cdclk_state(display->cdclk.obj.state);
+
+       intel_update_cdclk(display);
+       intel_cdclk_dump_config(display, &display->cdclk.hw, "Current CDCLK");
+       cdclk_state->actual = display->cdclk.hw;
+       cdclk_state->logical = display->cdclk.hw;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h 
b/drivers/gpu/drm/i915/display/intel_cdclk.h
index ff10ed526bd4..0d5ee1826168 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.h
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
@@ -102,5 +102,6 @@ int intel_cdclk_min_cdclk(const struct intel_cdclk_state 
*cdclk_state, enum pipe
 int intel_cdclk_bw_min_cdclk(const struct intel_cdclk_state *cdclk_state);
 bool intel_cdclk_pmdemand_needs_update(struct intel_atomic_state *state);
 void intel_cdclk_force_min_cdclk(struct intel_cdclk_state *cdclk_state, int 
force_min_cdclk);
+void intel_cdclk_read_hw(struct intel_display *display);
 
 #endif /* __INTEL_CDCLK_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c 
b/drivers/gpu/drm/i915/display/intel_display_driver.c
index ec799a1773e4..9058c23dd487 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -84,16 +84,10 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)
 
 void intel_display_driver_init_hw(struct intel_display *display)
 {
-       struct intel_cdclk_state *cdclk_state;
-
        if (!HAS_DISPLAY(display))
                return;
 
-       cdclk_state = to_intel_cdclk_state(display->cdclk.obj.state);
-
-       intel_update_cdclk(display);
-       intel_cdclk_dump_config(display, &display->cdclk.hw, "Current CDCLK");
-       cdclk_state->logical = cdclk_state->actual = display->cdclk.hw;
+       intel_cdclk_read_hw(display);
 
        intel_display_wa_apply(display);
 }
-- 
2.39.5