Attachment 68883 Details for Bug 54677 – force restore on lid open

[patch] force restore on lid open

0001-force-restore-on-lid-open.patch (text/plain), 3.50 KB, created by Daniel Vetter on 2012-10-21 19:18:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2012-10-21 19:18:08 UTC

Size: 3.50 KB

patch

obsolete

>From e1b316a625815f4c526812955d99a2e7d609a8c7 Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Sun, 21 Oct 2012 21:14:55 +0200
>Subject: [PATCH] force restore on lid open
>
>---
> drivers/gpu/drm/i915/i915_drv.c      |    2 +-
> drivers/gpu/drm/i915/i915_drv.h      |    3 ++-
> drivers/gpu/drm/i915/intel_display.c |   15 ++++++++++++---
> drivers/gpu/drm/i915/intel_lvds.c    |    2 +-
> 4 files changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 9e7e647..5e3fff1 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -548,7 +548,7 @@ static int i915_drm_thaw(struct drm_device *dev)
> 		mutex_unlock(&dev->struct_mutex);
> 
> 		intel_modeset_init_hw(dev);
>-		intel_modeset_setup_hw_state(dev);
>+		intel_modeset_setup_hw_state(dev, false);
> 		drm_irq_install(dev);
> 	}
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 4728d30..fd3832e 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1598,7 +1598,8 @@ extern void intel_modeset_init(struct drm_device *dev);
> extern void intel_modeset_gem_init(struct drm_device *dev);
> extern void intel_modeset_cleanup(struct drm_device *dev);
> extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
>-extern void intel_modeset_setup_hw_state(struct drm_device *dev);
>+extern void intel_modeset_setup_hw_state(struct drm_device *dev,
>+					 bool force_restore);
> extern bool intel_fbc_enabled(struct drm_device *dev);
> extern void intel_disable_fbc(struct drm_device *dev);
> extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index c2c219b..346e78a 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -8522,7 +8522,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> 
> /* Scan out the current hw modeset state, sanitizes it and maps it into the drm
>  * and i915 state tracking structures. */
>-void intel_modeset_setup_hw_state(struct drm_device *dev)
>+void intel_modeset_setup_hw_state(struct drm_device *dev,
>+				  bool force_restore)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	enum pipe pipe;
>@@ -8596,7 +8597,15 @@ void intel_modeset_setup_hw_state(struct drm_device *dev)
> 		intel_sanitize_crtc(crtc);
> 	}
> 
>-	intel_modeset_update_staged_output_state(dev);
>+	if (force_restore) {
>+		for_each_pipe(pipe) {
>+			crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
>+			intel_set_mode(&crtc->base, &crtc->base.mode,
>+				       crtc->base.x, crtc->base.y, crtc->base.fb);
>+		}
>+	} else {
>+		intel_modeset_update_staged_output_state(dev);
>+	}
> 
> 	intel_modeset_check_state(dev);
> 
>@@ -8609,7 +8618,7 @@ void intel_modeset_gem_init(struct drm_device *dev)
> 
> 	intel_setup_overlay(dev);
> 
>-	intel_modeset_setup_hw_state(dev);
>+	intel_modeset_setup_hw_state(dev, false);
> }
> 
> void intel_modeset_cleanup(struct drm_device *dev)
>diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
>index 40d72bd..589c917 100644
>--- a/drivers/gpu/drm/i915/intel_lvds.c
>+++ b/drivers/gpu/drm/i915/intel_lvds.c
>@@ -527,7 +527,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
> 	dev_priv->modeset_on_lid = 0;
> 
> 	mutex_lock(&dev->mode_config.mutex);
>-	intel_modeset_check_state(dev);
>+	intel_modeset_setup_hw_state(dev, true);
> 	mutex_unlock(&dev->mode_config.mutex);
> 
> 	return NOTIFY_OK;
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 54677: 66855 | 66856 | 66857 | 66883 | 68879 | 68880 | 68881 | 68883

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.