drm/i915: Change intel_encoders_<hook>() calling convention

Just pass the atomic state and the crtc to intel_encoders_enable() & co.
Make life simpler when you don't have to think which state (old vs. new)
you have to pass in. Also constify the states while at it.

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191118164430.27265-2-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a7e55c9dc40e33b6b3e14956f9216f8c6b7533dc..56fac063f02539c7d22dc956b9b13fa7c4fc30c1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6311,11 +6311,12 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state)
        }
 }
 
-static void intel_encoders_pre_pll_enable(struct intel_crtc *crtc,
-                                         struct intel_crtc_state *crtc_state,
-                                         struct intel_atomic_state *state)
+static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state,
+                                         struct intel_crtc *crtc)
 {
-       struct drm_connector_state *conn_state;
+       const struct intel_crtc_state *crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+       const struct drm_connector_state *conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6331,11 +6332,12 @@ static void intel_encoders_pre_pll_enable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_pre_enable(struct intel_crtc *crtc,
-                                     struct intel_crtc_state *crtc_state,
-                                     struct intel_atomic_state *state)
+static void intel_encoders_pre_enable(struct intel_atomic_state *state,
+                                     struct intel_crtc *crtc)
 {
-       struct drm_connector_state *conn_state;
+       const struct intel_crtc_state *crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+       const struct drm_connector_state *conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6351,11 +6353,12 @@ static void intel_encoders_pre_enable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_enable(struct intel_crtc *crtc,
-                                 struct intel_crtc_state *crtc_state,
-                                 struct intel_atomic_state *state)
+static void intel_encoders_enable(struct intel_atomic_state *state,
+                                 struct intel_crtc *crtc)
 {
-       struct drm_connector_state *conn_state;
+       const struct intel_crtc_state *crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+       const struct drm_connector_state *conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6372,11 +6375,12 @@ static void intel_encoders_enable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_disable(struct intel_crtc *crtc,
-                                  struct intel_crtc_state *old_crtc_state,
-                                  struct intel_atomic_state *state)
+static void intel_encoders_disable(struct intel_atomic_state *state,
+                                  struct intel_crtc *crtc)
 {
-       struct drm_connector_state *old_conn_state;
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
+       const struct drm_connector_state *old_conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6393,11 +6397,12 @@ static void intel_encoders_disable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_post_disable(struct intel_crtc *crtc,
-                                       struct intel_crtc_state *old_crtc_state,
-                                       struct intel_atomic_state *state)
+static void intel_encoders_post_disable(struct intel_atomic_state *state,
+                                       struct intel_crtc *crtc)
 {
-       struct drm_connector_state *old_conn_state;
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
+       const struct drm_connector_state *old_conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6413,11 +6418,12 @@ static void intel_encoders_post_disable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_post_pll_disable(struct intel_crtc *crtc,
-                                           struct intel_crtc_state *old_crtc_state,
-                                           struct intel_atomic_state *state)
+static void intel_encoders_post_pll_disable(struct intel_atomic_state *state,
+                                           struct intel_crtc *crtc)
 {
-       struct drm_connector_state *old_conn_state;
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
+       const struct drm_connector_state *old_conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6433,11 +6439,12 @@ static void intel_encoders_post_pll_disable(struct intel_crtc *crtc,
        }
 }
 
-static void intel_encoders_update_pipe(struct intel_crtc *crtc,
-                                      struct intel_crtc_state *crtc_state,
-                                      struct intel_atomic_state *state)
+static void intel_encoders_update_pipe(struct intel_atomic_state *state,
+                                      struct intel_crtc *crtc)
 {
-       struct drm_connector_state *conn_state;
+       const struct intel_crtc_state *crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+       const struct drm_connector_state *conn_state;
        struct drm_connector *conn;
        int i;
 
@@ -6504,7 +6511,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,
 
        intel_crtc->active = true;
 
-       intel_encoders_pre_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_enable(state, intel_crtc);
 
        if (pipe_config->has_pch_encoder) {
                /* Note: FDI PLL enabling _must_ be done before we enable the
@@ -6537,7 +6544,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,
        assert_vblank_disabled(crtc);
        intel_crtc_vblank_on(pipe_config);
 
-       intel_encoders_enable(intel_crtc, pipe_config, state);
+       intel_encoders_enable(state, intel_crtc);
 
        if (HAS_PCH_CPT(dev_priv))
                cpt_verify_modeset(dev, intel_crtc->pipe);
@@ -6621,12 +6628,12 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,
        if (WARN_ON(intel_crtc->active))
                return;
 
-       intel_encoders_pre_pll_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_pll_enable(state, intel_crtc);
 
        if (pipe_config->shared_dpll)
                intel_enable_shared_dpll(pipe_config);
 
-       intel_encoders_pre_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_enable(state, intel_crtc);
 
        if (intel_crtc_has_dp_encoder(pipe_config))
                intel_dp_set_m_n(pipe_config, M1_N1);
@@ -6703,7 +6710,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,
        assert_vblank_disabled(crtc);
        intel_crtc_vblank_on(pipe_config);
 
-       intel_encoders_enable(intel_crtc, pipe_config, state);
+       intel_encoders_enable(state, intel_crtc);
 
        if (psl_clkgate_wa) {
                intel_wait_for_vblank(dev_priv, pipe);
@@ -6751,7 +6758,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
        intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
        intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false);
 
-       intel_encoders_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_disable(state, intel_crtc);
 
        drm_crtc_vblank_off(crtc);
        assert_vblank_disabled(crtc);
@@ -6763,7 +6770,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
        if (old_crtc_state->has_pch_encoder)
                ironlake_fdi_disable(crtc);
 
-       intel_encoders_post_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_post_disable(state, intel_crtc);
 
        if (old_crtc_state->has_pch_encoder) {
                ironlake_disable_pch_transcoder(dev_priv, pipe);
@@ -6801,7 +6808,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;
 
-       intel_encoders_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_disable(state, intel_crtc);
 
        drm_crtc_vblank_off(crtc);
        assert_vblank_disabled(crtc);
@@ -6823,9 +6830,9 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
        else
                ironlake_pfit_disable(old_crtc_state);
 
-       intel_encoders_post_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_post_disable(state, intel_crtc);
 
-       intel_encoders_post_pll_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_post_pll_disable(state, intel_crtc);
 }
 
 static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)
@@ -7056,7 +7063,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,
 
        intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
 
-       intel_encoders_pre_pll_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_pll_enable(state, intel_crtc);
 
        if (IS_CHERRYVIEW(dev_priv)) {
                chv_prepare_pll(intel_crtc, pipe_config);
@@ -7066,7 +7073,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,
                vlv_enable_pll(intel_crtc, pipe_config);
        }
 
-       intel_encoders_pre_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_enable(state, intel_crtc);
 
        i9xx_pfit_enable(pipe_config);
 
@@ -7081,7 +7088,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,
        assert_vblank_disabled(crtc);
        intel_crtc_vblank_on(pipe_config);
 
-       intel_encoders_enable(intel_crtc, pipe_config, state);
+       intel_encoders_enable(state, intel_crtc);
 }
 
 static void i9xx_set_pll_dividers(const struct intel_crtc_state *crtc_state)
@@ -7120,7 +7127,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,
        if (!IS_GEN(dev_priv, 2))
                intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
 
-       intel_encoders_pre_enable(intel_crtc, pipe_config, state);
+       intel_encoders_pre_enable(state, intel_crtc);
 
        i9xx_enable_pll(intel_crtc, pipe_config);
 
@@ -7141,7 +7148,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,
        assert_vblank_disabled(crtc);
        intel_crtc_vblank_on(pipe_config);
 
-       intel_encoders_enable(intel_crtc, pipe_config, state);
+       intel_encoders_enable(state, intel_crtc);
 }
 
 static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)
@@ -7175,7 +7182,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,
        if (IS_GEN(dev_priv, 2))
                intel_wait_for_vblank(dev_priv, pipe);
 
-       intel_encoders_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_disable(state, intel_crtc);
 
        drm_crtc_vblank_off(crtc);
        assert_vblank_disabled(crtc);
@@ -7184,7 +7191,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,
 
        i9xx_pfit_disable(old_crtc_state);
 
-       intel_encoders_post_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_post_disable(state, intel_crtc);
 
        if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DSI)) {
                if (IS_CHERRYVIEW(dev_priv))
@@ -7195,7 +7202,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,
                        i9xx_disable_pll(old_crtc_state);
        }
 
-       intel_encoders_post_pll_disable(intel_crtc, old_crtc_state, state);
+       intel_encoders_post_pll_disable(state, intel_crtc);
 
        if (!IS_GEN(dev_priv, 2))
                intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
@@ -14370,7 +14377,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,
                intel_pre_plane_update(old_crtc_state, new_crtc_state);
 
                if (new_crtc_state->update_pipe)
-                       intel_encoders_update_pipe(crtc, new_crtc_state, state);
+                       intel_encoders_update_pipe(state, crtc);
        }
 
        if (new_crtc_state->update_pipe && !new_crtc_state->enable_fbc)