summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-03-12 13:37:15 +1100
committerJonathan Gray <jsg@jsg.id.au>2013-03-12 13:37:15 +1100
commit77521a05acc701b07a95c8194e1d60cbc2ad6dbd (patch)
tree9ec86c1bfd77140452dd3b2dd2e3ee3c9fc5e7f2
parent0abc1dfc02203d21c078edd8ac73e89e4abd7a5e (diff)
cancel the rps delayed resume timeout when suspending
-rw-r--r--sys/dev/pci/drm/i915_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index d096443b225..cee3cb83174 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -523,9 +523,7 @@ i915_drm_freeze(struct drm_device *dev)
return (error);
}
-#ifdef notyet
- cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);
-#endif
+ timeout_del(&dev_priv->rps.delayed_resume_to);
intel_modeset_disable(dev);