Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b996677 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c9f7fbf9

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

	}