drm/i915: Simplify DPLL state checker calling convention

Make life simpler by just passing in the atomic state + crtc
instead of plumbing in all kinds of crtc states.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231004155607.7719-5-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 237cfc8780a4326de42f9fc39dcde4bf85f7b0e0..399653a20f987d6d779ac91e6e16e6467888f20c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -4512,11 +4512,14 @@ verify_single_dpll_state(struct drm_i915_private *i915,
                        "pll hw state mismatch\n");
 }
 
-void intel_shared_dpll_state_verify(struct intel_crtc *crtc,
-                                   const struct intel_crtc_state *old_crtc_state,
-                                   const struct intel_crtc_state *new_crtc_state)
+void intel_shared_dpll_state_verify(struct intel_atomic_state *state,
+                                   struct intel_crtc *crtc)
 {
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       struct drm_i915_private *i915 = to_i915(state->base.dev);
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
 
        if (new_crtc_state->shared_dpll)
                verify_single_dpll_state(i915, new_crtc_state->shared_dpll,
@@ -4536,8 +4539,9 @@ void intel_shared_dpll_state_verify(struct intel_crtc *crtc,
        }
 }
 
-void intel_shared_dpll_verify_disabled(struct drm_i915_private *i915)
+void intel_shared_dpll_verify_disabled(struct intel_atomic_state *state)
 {
+       struct drm_i915_private *i915 = to_i915(state->base.dev);
        struct intel_shared_dpll *pll;
        int i;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
index e184680606e966f98cd4924d5872010a1e3327f1..dd4796a61751f0c52671d3420376769f9dd1699d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
@@ -369,9 +369,8 @@ void intel_dpll_dump_hw_state(struct drm_i915_private *i915,
 enum intel_dpll_id icl_tc_port_to_pll_id(enum tc_port tc_port);
 bool intel_dpll_is_combophy(enum intel_dpll_id id);
 
-void intel_shared_dpll_state_verify(struct intel_crtc *crtc,
-                                   const struct intel_crtc_state *old_crtc_state,
-                                   const struct intel_crtc_state *new_crtc_state);
-void intel_shared_dpll_verify_disabled(struct drm_i915_private *i915);
+void intel_shared_dpll_state_verify(struct intel_atomic_state *state,
+                                   struct intel_crtc *crtc);
+void intel_shared_dpll_verify_disabled(struct intel_atomic_state *state);
 
 #endif /* _INTEL_DPLL_MGR_H_ */

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
index 92b55b4fb74e0180e82fabc8500922660c0b44d8..47d45ba1e707bd30150d771d916d5781656a7ceb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
@@ -236,7 +236,7 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc,
        intel_wm_state_verify(crtc, new_crtc_state);
        verify_connector_state(state, crtc);
        verify_crtc_state(state, crtc);
-       intel_shared_dpll_state_verify(crtc, old_crtc_state, new_crtc_state);
+       intel_shared_dpll_state_verify(state, crtc);
        intel_mpllb_state_verify(state, new_crtc_state);
        intel_c10pll_state_verify(state, new_crtc_state);
 }
@@ -246,5 +246,5 @@ void intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,
 {
        verify_encoder_state(dev_priv, state);
        verify_connector_state(state, NULL);
-       intel_shared_dpll_verify_disabled(dev_priv);
+       intel_shared_dpll_verify_disabled(state);
 }