| From dd02637968f57286484f64fae638f1e72dba9731 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 16 Sep 2013 17:38:37 +0300 |
| Subject: drm/i915: Drop explicit plane restoration during resume |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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ä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 2b9966771d3b84da6383e8695350beea3213f848) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 3 --- |
| 1 file changed, 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -10638,7 +10638,6 @@ void intel_modeset_setup_hw_state(struct |
| { |
| 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; |
| @@ -10699,8 +10698,6 @@ void intel_modeset_setup_hw_state(struct |
| __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); |
| } |
