drm/i915: move dev_priv->suspend around

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_sysfs.c

diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 33bcae314bf86ea5f7a2deafb80625d0382634af..0c741f4eefb04b1fcfbab17e55957dc5324f61df 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -357,6 +357,11 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,
                else
                        gen6_set_rps(dev, val);
        }
+       else if (!IS_VALLEYVIEW(dev))
+               /* We still need gen6_set_rps to process the new max_delay
+                  and update the interrupt limits even though frequency
+                  request is unchanged. */
+               gen6_set_rps(dev, dev_priv->rps.cur_delay);
 
        mutex_unlock(&dev_priv->rps.hw_lock);
 
@@ -426,6 +431,11 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,
                else
                        gen6_set_rps(dev, val);
        }
+       else if (!IS_VALLEYVIEW(dev))
+               /* We still need gen6_set_rps to process the new min_delay
+                  and update the interrupt limits even though frequency
+                  request is unchanged. */
+               gen6_set_rps(dev, dev_priv->rps.cur_delay);
 
        mutex_unlock(&dev_priv->rps.hw_lock);