[CI,7/8] move-opregion-setup

Commit Message

Chris Wilson May 18, 2016, 9:50 a.m. UTC

---
 drivers/gpu/drm/i915/i915_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 44c4743770ed..8b4f26b82e62 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -857,6 +857,8 @@  static void intel_kms_resume(void *data, async_cookie_t cookie)
 	struct resume_context *ctx = data;
 	struct drm_device *dev = ctx->i915->dev;
 
+	intel_opregion_setup(dev);
+
 	intel_init_pch_refclk(dev);
 	drm_mode_config_reset(dev);
 
@@ -901,7 +903,6 @@  static int i915_drm_resume(struct drm_device *dev)
 	intel_csr_ucode_resume(ctx->i915);
 
 	i915_restore_state(dev);
-	intel_opregion_setup(dev);
 
 	ctx->cookie = async_schedule_domain(intel_kms_resume,
 					    resume_context_get(ctx),