From 77521a05acc701b07a95c8194e1d60cbc2ad6dbd Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Tue, 12 Mar 2013 13:37:15 +1100
Subject: cancel the rps delayed resume timeout when suspending

---
 sys/dev/pci/drm/i915_drv.c | 4 +---
 1 file changed, 1 insertion(+), 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);
 
-- 
cgit v1.2.3