drm/i915: Change .crtc_enable/disable() calling convention

Just pass the atomic state+crtc to the .crtc_enable()
.crtc_disable(). Life is easier when you don't have to think
whether to pass the old or the new crtc state.

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-11-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 4f38e063d02fdf22ebb8b115964b51eddc5d7fc1..7d6d0393d73ffbdd801d638049209b0433f9677b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6472,10 +6472,11 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
        plane->disable_plane(plane, crtc_state);
 }
 
-static void ironlake_crtc_enable(struct intel_crtc_state *new_crtc_state,
-                                struct intel_atomic_state *state)
+static void ironlake_crtc_enable(struct intel_atomic_state *state,
+                                struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
@@ -6615,10 +6616,11 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)
        I915_WRITE(reg, val);
 }
 
-static void haswell_crtc_enable(struct intel_crtc_state *new_crtc_state,
-                               struct intel_atomic_state *state)
+static void haswell_crtc_enable(struct intel_atomic_state *state,
+                               struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe, hsw_workaround_pipe;
        enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
@@ -6737,10 +6739,11 @@ static void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
        }
 }
 
-static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
-                                 struct intel_atomic_state *state)
+static void ironlake_crtc_disable(struct intel_atomic_state *state,
+                                 struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
@@ -6793,10 +6796,11 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
        intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, true);
 }
 
-static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
-                                struct intel_atomic_state *state)
+static void haswell_crtc_disable(struct intel_atomic_state *state,
+                                struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;
 
@@ -7025,10 +7029,11 @@ static void modeset_put_power_domains(struct drm_i915_private *dev_priv,
                intel_display_power_put_unchecked(dev_priv, domain);
 }
 
-static void valleyview_crtc_enable(struct intel_crtc_state *new_crtc_state,
-                                  struct intel_atomic_state *state)
+static void valleyview_crtc_enable(struct intel_atomic_state *state,
+                                  struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
@@ -7088,10 +7093,11 @@ static void i9xx_set_pll_dividers(const struct intel_crtc_state *crtc_state)
        I915_WRITE(FP1(crtc->pipe), crtc_state->dpll_hw_state.fp1);
 }
 
-static void i9xx_crtc_enable(struct intel_crtc_state *new_crtc_state,
-                            struct intel_atomic_state *state)
+static void i9xx_crtc_enable(struct intel_atomic_state *state,
+                            struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
+       const struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
@@ -7150,10 +7156,11 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)
        I915_WRITE(PFIT_CONTROL, 0);
 }
 
-static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,
-                             struct intel_atomic_state *state)
+static void i9xx_crtc_disable(struct intel_atomic_state *state,
+                             struct intel_crtc *crtc)
 {
-       struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
+       struct intel_crtc_state *old_crtc_state =
+               intel_atomic_get_old_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum pipe pipe = crtc->pipe;
 
@@ -7239,7 +7246,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
 
        WARN_ON(IS_ERR(temp_crtc_state) || ret);
 
-       dev_priv->display.crtc_disable(temp_crtc_state, to_intel_atomic_state(state));
+       dev_priv->display.crtc_disable(to_intel_atomic_state(state),
+                                      intel_crtc);
 
        drm_atomic_state_put(state);
 
@@ -14345,7 +14353,7 @@ static void intel_update_crtc(struct intel_crtc *crtc,
        if (modeset) {
                intel_crtc_update_active_timings(new_crtc_state);
 
-               dev_priv->display.crtc_enable(new_crtc_state, state);
+               dev_priv->display.crtc_enable(state, crtc);
 
                /* vblanks work again, re-enable pipe CRC. */
                intel_crtc_enable_pipe_crc(crtc);
@@ -14416,7 +14424,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
         */
        intel_crtc_disable_pipe_crc(crtc);
 
-       dev_priv->display.crtc_disable(old_crtc_state, state);
+       dev_priv->display.crtc_disable(state, crtc);
        crtc->active = false;
        intel_fbc_disable(crtc);
        intel_disable_shared_dpll(old_crtc_state);
@@ -14531,7 +14539,7 @@ static void intel_crtc_enable_trans_port_sync(struct intel_crtc *crtc,
        struct drm_i915_private *dev_priv = to_i915(state->base.dev);
 
        intel_crtc_update_active_timings(new_crtc_state);
-       dev_priv->display.crtc_enable(new_crtc_state, state);
+       dev_priv->display.crtc_enable(state, crtc);
        intel_crtc_enable_pipe_crc(crtc);
 }
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9b37c0d657dec83c66d79e47f3592772031874c6..fdae5a919bc88d72b028af004e6a1f813ee11b14 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -290,10 +290,10 @@ struct drm_i915_display_funcs {
                                         struct intel_initial_plane_config *);
        int (*crtc_compute_clock)(struct intel_crtc *crtc,
                                  struct intel_crtc_state *crtc_state);
-       void (*crtc_enable)(struct intel_crtc_state *pipe_config,
-                           struct intel_atomic_state *old_state);
-       void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,
-                            struct intel_atomic_state *old_state);
+       void (*crtc_enable)(struct intel_atomic_state *state,
+                           struct intel_crtc *crtc);
+       void (*crtc_disable)(struct intel_atomic_state *state,
+                            struct intel_crtc *crtc);
        void (*commit_modeset_enables)(struct intel_atomic_state *state);
        void (*commit_modeset_disables)(struct intel_atomic_state *state);
        void (*audio_codec_enable)(struct intel_encoder *encoder,