]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/i915: Store the requested frequency whilst RPS is disabled
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 20 Feb 2017 09:47:08 +0000 (09:47 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 20 Feb 2017 12:40:29 +0000 (12:40 +0000)
If intel_set_rps() is called whilst the hw is disabled, just store the
requested frequency (from the user) for application when we wake the hw
up.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170220094713.22874-2-chris@chris-wilson.co.uk
Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
drivers/gpu/drm/i915/intel_pm.c

index e1878cb5d56922f4cacd580a82bd0f686a677a9e..af11c4090c075ab3caf505722c0d7fade8ee7370 100644 (file)
@@ -5105,6 +5105,11 @@ int intel_set_rps(struct drm_i915_private *dev_priv, u8 val)
        GEM_BUG_ON(val > dev_priv->rps.max_freq);
        GEM_BUG_ON(val < dev_priv->rps.min_freq);
 
+       if (!dev_priv->rps.enabled) {
+               dev_priv->rps.cur_freq = val;
+               return 0;
+       }
+
        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
                err = valleyview_set_rps(dev_priv, val);
        else