drm/i915/cdclk: abstract intel_cdclk_min_cdclk()

Add intel_cdclk_min_cdclk() helper to avoid looking at struct
intel_cdclk_state internals outside of intel_cdclk.c.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/af768e7fc32d8fa8ddcbbe2683266c30ae3b925d.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 51485c777b6236312469d00e4b846f93c839296e..1fc82844458b8e26fca0223d8fffb2708aca8fa2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3839,3 +3839,8 @@ int intel_cdclk_logical(const struct intel_cdclk_state *cdclk_state)
 {
        return cdclk_state->logical.cdclk;
 }
+
+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 20a66f6130728bcbeab3144edc8f6a9949a2564a..ef6ad9d04c200a859cee4a84339bcb25d7440a11 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.h
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
@@ -98,5 +98,6 @@ 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_min_cdclk(const struct intel_cdclk_state *cdclk_state, enum pipe pipe);
 
 #endif /* __INTEL_CDCLK_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index eae926d998ff7d9758ba46b8005cf78764d64558..7c28ef677107860489405ff21677c441e06b93cb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -333,7 +333,7 @@ int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
         * display blinking due to constant cdclk changes.
         */
        if (new_crtc_state->min_cdclk[plane->id] <=
-           cdclk_state->min_cdclk[crtc->pipe])
+           intel_cdclk_min_cdclk(cdclk_state, crtc->pipe))
                return 0;
 
        drm_dbg_kms(display->drm,
@@ -341,7 +341,7 @@ int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
                    plane->base.base.id, plane->base.name,
                    new_crtc_state->min_cdclk[plane->id],
                    crtc->base.base.id, crtc->base.name,
-                   cdclk_state->min_cdclk[crtc->pipe]);
+                   intel_cdclk_min_cdclk(cdclk_state, crtc->pipe));
        *need_cdclk_calc = true;
 
        return 0;