drm/i915: Use intel_ types in haswell_mode_set_planes_workaround()

Pass around intel_atomic_state rather than drm_atomic_state.
This avoids some extra casts and annoing aliasing variables.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-5-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c47e827e3835c02831dc79824d1fdd709af62fff..791a28e7ecbea0e02cfb7d5599f846a6fa1c26b2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13120,29 +13120,27 @@ static void intel_modeset_clear_plls(struct intel_atomic_state *state)
  * multiple pipes, and planes are enabled after the pipe, we need to wait at
  * least 2 vblanks on the first pipe before enabling planes on the second pipe.
  */
-static int haswell_mode_set_planes_workaround(struct drm_atomic_state *state)
+static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state)
 {
-       struct drm_crtc_state *crtc_state;
-       struct intel_crtc *intel_crtc;
-       struct drm_crtc *crtc;
+       struct intel_crtc_state *crtc_state;
+       struct intel_crtc *crtc;
        struct intel_crtc_state *first_crtc_state = NULL;
        struct intel_crtc_state *other_crtc_state = NULL;
        enum pipe first_pipe = INVALID_PIPE, enabled_pipe = INVALID_PIPE;
        int i;
 
        /* look at all crtc's that are going to be enabled in during modeset */
-       for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
-               intel_crtc = to_intel_crtc(crtc);
-
-               if (!crtc_state->active || !needs_modeset(crtc_state))
+       for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
+               if (!crtc_state->base.active ||
+                   !needs_modeset(&crtc_state->base))
                        continue;
 
                if (first_crtc_state) {
-                       other_crtc_state = to_intel_crtc_state(crtc_state);
+                       other_crtc_state = crtc_state;
                        break;
                } else {
-                       first_crtc_state = to_intel_crtc_state(crtc_state);
-                       first_pipe = intel_crtc->pipe;
+                       first_crtc_state = crtc_state;
+                       first_pipe = crtc->pipe;
                }
        }
 
@@ -13151,24 +13149,22 @@ static int haswell_mode_set_planes_workaround(struct drm_atomic_state *state)
                return 0;
 
        /* w/a possibly needed, check how many crtc's are already enabled. */
-       for_each_intel_crtc(state->dev, intel_crtc) {
-               struct intel_crtc_state *pipe_config;
-
-               pipe_config = intel_atomic_get_crtc_state(state, intel_crtc);
-               if (IS_ERR(pipe_config))
-                       return PTR_ERR(pipe_config);
+       for_each_intel_crtc(state->base.dev, crtc) {
+               crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);
+               if (IS_ERR(crtc_state))
+                       return PTR_ERR(crtc_state);
 
-               pipe_config->hsw_workaround_pipe = INVALID_PIPE;
+               crtc_state->hsw_workaround_pipe = INVALID_PIPE;
 
-               if (!pipe_config->base.active ||
-                   needs_modeset(&pipe_config->base))
+               if (!crtc_state->base.active ||
+                   needs_modeset(&crtc_state->base))
                        continue;
 
                /* 2 or more enabled crtcs means no need for w/a */
                if (enabled_pipe != INVALID_PIPE)
                        return 0;
 
-               enabled_pipe = intel_crtc->pipe;
+               enabled_pipe = crtc->pipe;
        }
 
        if (enabled_pipe != INVALID_PIPE)
@@ -13331,7 +13327,7 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
        intel_modeset_clear_plls(intel_state);
 
        if (IS_HASWELL(dev_priv))
-               return haswell_mode_set_planes_workaround(state);
+               return haswell_mode_set_planes_workaround(intel_state);
 
        return 0;
 }