From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 26 Mar 2013 20:25:27 +0000 (-0700)
Subject: drm/i915: restore cursor and sprite state when forcing a config restore v2
X-Git-Tag: v3.10-rc1~110^2~51^2~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5644d0554f37016763f615bd65cd68af96aa509;p=users%2Fjedix%2Flinux-maple.git

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: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7307974d29eb..8f0db8cf6ced 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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 {