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

Commit b5644d05 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: restore cursor and sprite state when forcing a config restore v2 



Needed for VT switchless resume.

v2: cursor state is now handled correctly in crtc_enable (Daniel)

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5e1bac2f

drivers/gpu/drm/i915/intel_display.c

+6 −1
Original line number Diff line number Diff line
@@ -9106,6 +9106,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe pipe;

	u32 tmp;

	struct drm_plane *plane;

	struct intel_crtc *crtc;

	struct intel_encoder *encoder;

	struct intel_connector *connector;
@@ -9210,8 +9211,12 @@ setup_pipes: 


	if (force_restore) {

		for_each_pipe(pipe) {

			intel_crtc_restore_mode(dev_priv->pipe_to_crtc_mapping[pipe]);

			struct drm_crtc *crtc =

				dev_priv->pipe_to_crtc_mapping[pipe];

			intel_crtc_restore_mode(crtc);

		}

		list_for_each_entry(plane, &dev->mode_config.plane_list, head)

			intel_plane_restore(plane);



		i915_redisable_vga(dev);

	} else {