<div dir="ltr">Reviewed-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@gmail.com">rodrigo.vivi@gmail.com</a>><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Mar 26, 2013 at 1:25 PM, Jesse Barnes <span dir="ltr"><<a href="mailto:jbarnes@virtuousgeek.org" target="_blank">jbarnes@virtuousgeek.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Needed for VT switchless resume.<br>
<br>
Signed-off-by: Jesse Barnes <<a href="mailto:jbarnes@virtuousgeek.org">jbarnes@virtuousgeek.org</a>><br>
---<br>
drivers/gpu/drm/i915/intel_display.c | 15 ++++++++++++++-<br>
1 file changed, 14 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c<br>
index 7307974..093006b 100644<br>
--- a/drivers/gpu/drm/i915/intel_display.c<br>
+++ b/drivers/gpu/drm/i915/intel_display.c<br>
@@ -9106,6 +9106,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,<br>
struct drm_i915_private *dev_priv = dev->dev_private;<br>
enum pipe pipe;<br>
u32 tmp;<br>
+ struct drm_plane *plane;<br>
struct intel_crtc *crtc;<br>
struct intel_encoder *encoder;<br>
struct intel_connector *connector;<br>
@@ -9210,8 +9211,20 @@ setup_pipes:<br>
<br>
if (force_restore) {<br>
for_each_pipe(pipe) {<br>
- intel_crtc_restore_mode(dev_priv->pipe_to_crtc_mapping[pipe]);<br>
+ struct drm_crtc *crtc =<br>
+ dev_priv->pipe_to_crtc_mapping[pipe];<br>
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);<br>
+<br>
+ intel_crtc_restore_mode(crtc);<br>
+ if (intel_crtc->cursor_visible) {<br>
+ /* Force update for previously enabled cursor */<br>
+ intel_crtc->cursor_visible = false;<br>
+ intel_crtc_update_cursor(&intel_crtc->base,<br>
+ true);<br>
+ }<br>
}<br>
+ list_for_each_entry(plane, &dev->mode_config.plane_list, head)<br>
+ intel_plane_restore(plane);<br>
<br>
i915_redisable_vga(dev);<br>
} else {<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.5<br>
<br>
_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div>
</div>