drm/i915: Simplify the state checker calling convetions

We're passing in a totally random mismash of things into the state
checker. Clean it up to pass in the minimum needed.

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 8683b030cebb1a77378e32dfcde547b16ce98faf..e309fda108efc27f93bec8578a50d7cfde9af62f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7218,7 +7218,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 
                intel_set_cdclk_pre_plane_update(state);
 
-               intel_modeset_verify_disabled(dev_priv, state);
+               intel_modeset_verify_disabled(state);
        }
 
        intel_sagv_pre_plane_update(state);
@@ -7304,7 +7304,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 
                intel_modeset_put_crtc_power_domains(crtc, &put_domains[crtc->pipe]);
 
-               intel_modeset_verify_crtc(crtc, state, old_crtc_state, new_crtc_state);
+               intel_modeset_verify_crtc(state, crtc);
 
                /* Must be done after gamma readout due to HSW split gamma vs. IPS w/a */
                hsw_ips_post_update(state, crtc);

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
index f16babc613e676fa0799d0b10472971f01715893..eeb9f978e97741b1dcf73ca9eb175b3cac3cb8fb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
@@ -86,9 +86,10 @@ verify_connector_state(struct intel_atomic_state *state,
        }
 }
 
-static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,
-                                          const struct intel_crtc_state *pipe_config)
+static void intel_pipe_config_sanity_check(const struct intel_crtc_state *pipe_config)
 {
+       struct drm_i915_private *dev_priv = to_i915(pipe_config->uapi.crtc->dev);
+
        if (pipe_config->has_pch_encoder) {
                int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(dev_priv, pipe_config),
                                                            &pipe_config->fdi_m_n);
@@ -106,8 +107,9 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,
 }
 
 static void
-verify_encoder_state(struct drm_i915_private *dev_priv, struct intel_atomic_state *state)
+verify_encoder_state(struct intel_atomic_state *state)
 {
+       struct drm_i915_private *dev_priv = to_i915(state->base.dev);
        struct intel_encoder *encoder;
        struct drm_connector *connector;
        const struct drm_connector_state *old_conn_state, *new_conn_state;
@@ -214,7 +216,7 @@ verify_crtc_state(struct intel_atomic_state *state,
        if (!new_crtc_state->hw.active)
                return;
 
-       intel_pipe_config_sanity_check(dev_priv, pipe_config);
+       intel_pipe_config_sanity_check(pipe_config);
 
        if (!intel_pipe_config_compare(new_crtc_state,
                                       pipe_config, false)) {
@@ -224,11 +226,12 @@ verify_crtc_state(struct intel_atomic_state *state,
        }
 }
 
-void intel_modeset_verify_crtc(struct intel_crtc *crtc,
-                              struct intel_atomic_state *state,
-                              const struct intel_crtc_state *old_crtc_state,
-                              const struct intel_crtc_state *new_crtc_state)
+void intel_modeset_verify_crtc(struct intel_atomic_state *state,
+                              struct intel_crtc *crtc)
 {
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+
        if (!intel_crtc_needs_modeset(new_crtc_state) &&
            !intel_crtc_needs_fastset(new_crtc_state))
                return;
@@ -241,10 +244,9 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc,
        intel_c10pll_state_verify(state, crtc);
 }
 
-void intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,
-                                  struct intel_atomic_state *state)
+void intel_modeset_verify_disabled(struct intel_atomic_state *state)
 {
-       verify_encoder_state(dev_priv, state);
+       verify_encoder_state(state);
        verify_connector_state(state, NULL);
        intel_shared_dpll_verify_disabled(state);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.h b/drivers/gpu/drm/i915/display/intel_modeset_verify.h
index 77786a877f6add0421afc10721f5f7747791f79f..3bef8735cb4bc79c70c397dc66c361a86e0805e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_verify.h
+++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.h
@@ -6,16 +6,11 @@
 #ifndef __INTEL_MODESET_VERIFY_H__
 #define __INTEL_MODESET_VERIFY_H__
 
-struct drm_i915_private;
 struct intel_atomic_state;
 struct intel_crtc;
-struct intel_crtc_state;
 
-void intel_modeset_verify_crtc(struct intel_crtc *crtc,
-                              struct intel_atomic_state *state,
-                              const struct intel_crtc_state *old_crtc_state,
-                              const struct intel_crtc_state *new_crtc_state);
-void intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,
-                                  struct intel_atomic_state *state);
+void intel_modeset_verify_crtc(struct intel_atomic_state *state,
+                              struct intel_crtc *crtc);
+void intel_modeset_verify_disabled(struct intel_atomic_state *state);
 
 #endif /* __INTEL_MODESET_VERIFY_H__ */