From: Ville Syrjälä Date: Mon, 16 Sep 2013 14:38:37 +0000 (+0300) Subject: drm/i915: Drop explicit plane restoration during resume X-Git-Tag: next-20131017~58^2~1^2~76 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b9966771d3b84da6383e8695350beea3213f848;p=karo-tx-linux.git drm/i915: Drop explicit plane restoration during resume We already restore planes during the modeset operation, so no need to do another loop over the planes and try to restore them again. Signed-off-by: Ville Syrjälä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dd61700a40c1..5a9683761c8f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10636,7 +10636,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, { struct drm_i915_private *dev_priv = dev->dev_private; enum pipe pipe; - struct drm_plane *plane; struct intel_crtc *crtc; struct intel_encoder *encoder; int i; @@ -10697,8 +10696,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, crtc->fb); } - list_for_each_entry(plane, &dev->mode_config.plane_list, head) - intel_plane_restore(plane); } else { intel_modeset_update_staged_output_state(dev); }