drm/i915: Handle CHV in vlv_set_rps_idle()
Move the CHV check into vlv_set_rps_idle() to simplify the caller a bit. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
b8d24a0656
commit
21a11fff7c
|
@ -3799,8 +3799,8 @@ static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = dev_priv->dev;
|
struct drm_device *dev = dev_priv->dev;
|
||||||
|
|
||||||
/* Latest VLV doesn't need to force the gfx clock */
|
/* CHV and latest VLV don't need to force the gfx clock */
|
||||||
if (dev->pdev->revision >= 0xd) {
|
if (IS_CHERRYVIEW(dev) || dev->pdev->revision >= 0xd) {
|
||||||
valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
|
valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -3839,9 +3839,7 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv)
|
||||||
|
|
||||||
mutex_lock(&dev_priv->rps.hw_lock);
|
mutex_lock(&dev_priv->rps.hw_lock);
|
||||||
if (dev_priv->rps.enabled) {
|
if (dev_priv->rps.enabled) {
|
||||||
if (IS_CHERRYVIEW(dev))
|
if (IS_VALLEYVIEW(dev))
|
||||||
valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
|
|
||||||
else if (IS_VALLEYVIEW(dev))
|
|
||||||
vlv_set_rps_idle(dev_priv);
|
vlv_set_rps_idle(dev_priv);
|
||||||
else
|
else
|
||||||
gen6_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
|
gen6_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
|
||||||
|
|
Loading…
Reference in a new issue