drm/i915: Make __intel_set_mode() take only atomic state as argument
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Mon, 1 Jun 2015 10:49:50 +0000 (12:49 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 12 Jun 2015 10:19:32 +0000 (13:19 +0300)
With the use of drm_atomic_helper_update_legacy_modeset_state the
last user of modeset_crtc is removed from this function.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c

index c1042ea501361cd3dceb8698c6d1c2515d24abe2..7116217ca25ba3074d161a9458827de34772826e 100644 (file)
@@ -12909,12 +12909,10 @@ static int __intel_set_mode_checks(struct drm_atomic_state *state)
        return 0;
 }
 
-static int __intel_set_mode(struct drm_crtc *modeset_crtc,
-                           struct intel_crtc_state *pipe_config)
+static int __intel_set_mode(struct drm_atomic_state *state)
 {
-       struct drm_device *dev = modeset_crtc->dev;
+       struct drm_device *dev = state->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
-       struct drm_atomic_state *state = pipe_config->base.state;
        struct drm_crtc *crtc;
        struct drm_crtc_state *crtc_state;
        int ret = 0;
@@ -12974,7 +12972,7 @@ static int intel_set_mode_with_config(struct drm_crtc *crtc,
 {
        int ret;
 
-       ret = __intel_set_mode(crtc, pipe_config);
+       ret = __intel_set_mode(pipe_config->base.state);
 
        if (ret == 0)
                intel_modeset_check_state(crtc->dev);