drm/i915/cdclk: abstract intel_cdclk_actual() and intel_cdclk_actual_voltage_level()

Add intel_cdclk_actual() and intel_cdclk_actual_voltage_level() helpers
to avoid looking at struct intel_cdclk_state internals outside of
intel_cdclk.c.

v2: Better location (Imre)

Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/241a9b80a8262b82fded54707ca5622af215dd86.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 156b5b5190cce5ad711deb6ccb81ae09476dd01a..588d776e862496be971c26fdad35b1dd7e3a8b65 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3840,6 +3840,16 @@ int intel_cdclk_logical(const struct intel_cdclk_state *cdclk_state)
        return cdclk_state->logical.cdclk;
 }
 
+int intel_cdclk_actual(const struct intel_cdclk_state *cdclk_state)
+{
+       return cdclk_state->actual.cdclk;
+}
+
+int intel_cdclk_actual_voltage_level(const struct intel_cdclk_state *cdclk_state)
+{
+       return cdclk_state->actual.voltage_level;
+}
+
 int intel_cdclk_min_cdclk(const struct intel_cdclk_state *cdclk_state, enum pipe pipe)
 {
        return cdclk_state->min_cdclk[pipe];

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
index 0d5ee182616864636786c21f02c58cf6660457f3..07f8b184b5fef1b79959fd4257b1aeb94c81c524 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.h
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
@@ -98,6 +98,8 @@ int intel_cdclk_init(struct intel_display *display);
 void intel_cdclk_debugfs_register(struct intel_display *display);
 
 int intel_cdclk_logical(const struct intel_cdclk_state *cdclk_state);
+int intel_cdclk_actual(const struct intel_cdclk_state *cdclk_state);
+int intel_cdclk_actual_voltage_level(const struct intel_cdclk_state *cdclk_state);
 int intel_cdclk_min_cdclk(const struct intel_cdclk_state *cdclk_state, enum pipe 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);

diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c b/drivers/gpu/drm/i915/display/intel_pmdemand.c
index 16ef68ef4041c6371c3be7553b13464ccfe3d835..d806c15db7ceddf25967df864639b3b65baef2ec 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pmdemand.c
+++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c
@@ -360,9 +360,9 @@ int intel_pmdemand_atomic_check(struct intel_atomic_state *state)
                return PTR_ERR(new_cdclk_state);
 
        new_pmdemand_state->params.voltage_index =
-               new_cdclk_state->actual.voltage_level;
+               intel_cdclk_actual_voltage_level(new_cdclk_state);
        new_pmdemand_state->params.cdclk_freq_mhz =
-               DIV_ROUND_UP(new_cdclk_state->actual.cdclk, 1000);
+               DIV_ROUND_UP(intel_cdclk_actual(new_cdclk_state), 1000);
 
        intel_pmdemand_update_max_ddiclk(display, state, new_pmdemand_state);