1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5fd6a5db6eb5..a569597125db 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -847,6 +847,8 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
         drm_i915_private_t *dev_priv = dev->dev_private;
         int ret;
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         if (IS_GEN5(dev)) {
                 u16 rgvswctl = I915_READ16(MEMSWCTL);
                 u16 rgvstat = I915_READ16(MEMSTAT_ILK);
@@ -1325,6 +1327,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)
                 return 0;
         }
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);
         if (ret)
                 return ret;
@@ -1940,6 +1944,8 @@ i915_max_freq_get(void *data, u64 *val)
         if (!(IS_GEN6(dev) || IS_GEN7(dev)))
                 return -ENODEV;
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);
         if (ret)
                 return ret;
@@ -1964,6 +1970,8 @@ i915_max_freq_set(void *data, u64 val)
         if (!(IS_GEN6(dev) || IS_GEN7(dev)))
                 return -ENODEV;
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         DRM_DEBUG_DRIVER("Manually setting max freq to %llu\n", val);
 
         ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);
@@ -2002,6 +2010,8 @@ i915_min_freq_get(void *data, u64 *val)
         if (!(IS_GEN6(dev) || IS_GEN7(dev)))
                 return -ENODEV;
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);
         if (ret)
                 return ret;
@@ -2026,6 +2036,8 @@ i915_min_freq_set(void *data, u64 val)
         if (!(IS_GEN6(dev) || IS_GEN7(dev)))
                 return -ENODEV;
 
+        flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
         DRM_DEBUG_DRIVER("Manually setting min freq to %llu\n", val);
 
         ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock);