Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>
On Tue, Mar 26, 2013 at 1:25 PM, Jesse Barnes <jbarnes at virtuousgeek.org>wrote:
> Needed for VT switchless resume.
>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/intel_display.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 7307974..093006b 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,20 @@ 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];
> + struct intel_crtc *intel_crtc =
> to_intel_crtc(crtc);
> +
> + intel_crtc_restore_mode(crtc);
> + if (intel_crtc->cursor_visible) {
> + /* Force update for previously enabled
> cursor */
> + intel_crtc->cursor_visible = false;
> + intel_crtc_update_cursor(&intel_crtc->base,
> + true);
> + }
> }
> + list_for_each_entry(plane, &dev->mode_config.plane_list,
> head)
> + intel_plane_restore(plane);
>
> i915_redisable_vga(dev);
> } else {
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20130326/f19fc625/attachment.html>
