| From ccb93711919182bb1f3af62eab7a43b33388820f Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 16 Sep 2013 17:38:35 +0300 |
| Subject: drm/i915: Move power well resume earlier |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| i915_restore_state() -> i915_restore_display() will attempt to |
| re-disable VGA during resume. So the power well needs to be powered on |
| before that. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit ebdcefc6eb209b5197d2f0f73bcc9b0396fdf53e) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_drv.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c |
| index 6f385e1e9ed6..827c274a8f20 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.c |
| +++ b/drivers/gpu/drm/i915/i915_drv.c |
| @@ -590,6 +590,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) |
| mutex_unlock(&dev->struct_mutex); |
| } |
| |
| + intel_init_power_well(dev); |
| + |
| i915_restore_state(dev); |
| intel_opregion_setup(dev); |
| |
| @@ -605,8 +607,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) |
| /* We need working interrupts for modeset enabling ... */ |
| drm_irq_install(dev); |
| |
| - intel_init_power_well(dev); |
| - |
| intel_modeset_init_hw(dev); |
| |
| drm_modeset_lock_all(dev); |
| -- |
| 1.8.5.rc3 |
| |
