drm/i915/cdclk: abstract intel_cdclk_read_hw()

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.deak@intel.com>
Link: https://lore.kernel.org/r/ef720d37bfeee933d59b64e382dc976f3c9fade1.1750847509.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 0c2d0195a2d9b90d576d0da0287d1b4155c9edc2..156b5b5190cce5ad711deb6ccb81ae09476dd01a 100644 (file)
--- 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 ff10ed526bd4b1ac3a641792a6de97fa65968e1a..0d5ee182616864636786c21f02c58cf6660457f3 100644 (file)
--- 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 ec799a1773e47d71307b3a57d52caf2d690eb1e1..9058c23dd4875f8ab0bf8508e9b8bd804fe26edd 100644 (file)
--- 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);
 }