diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-12-13 15:22:30 -0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-14 15:33:52 +0100 |
| commit | 16a3d6ef9f9db6b0e54e6bb756a6b6165166cf44 (patch) | |
| tree | a601b738bb1d95971d1b0e6eead5ed8f2570f10d /drivers/gpu/drm/i915/i915_drv.c | |
| parent | ab57fff1302c485d74992d34df24ccb5efda244e (diff) | |
| download | talos-op-linux-16a3d6ef9f9db6b0e54e6bb756a6b6165166cf44.tar.gz talos-op-linux-16a3d6ef9f9db6b0e54e6bb756a6b6165166cf44.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |
