From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Fri, 13 Dec 2013 17:22:30 +0000 (-0200)
Subject: drm/i915: cancel the hangcheck before runtime suspend
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=16a3d6ef9f9db6b0e54e6bb756a6b6165166cf44;p=linux-beck.git

drm/i915: cancel the hangcheck before runtime suspend

The hangcheck function requires the hardware to be working, and if
we're suspending we're going to put the HW in D3 state.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c2c9a93861ae..df634a42cc0c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -917,6 +917,7 @@ static int i915_runtime_suspend(struct device *device)
 
 	DRM_DEBUG_KMS("Suspending device\n");
 
+	del_timer_sync(&dev_priv->gpu_error.hangcheck_timer);
 	dev_priv->pm.suspended = true;
 	intel_opregion_notify_adapter(dev, PCI_D3cold);