On Thu, Dec 12, 2013 at 02:36:36PM +0000, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>
Merged this one here, not really sure what to do with the rest.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_pm.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index c01d08d..351065d 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3584,9 +3584,11 @@ void gen6_set_rps(struct drm_device *dev, u8 val)
>
> void gen6_rps_idle(struct drm_i915_private *dev_priv)
> {
> + struct drm_device *dev = dev_priv->dev;
> +
> mutex_lock(&dev_priv->rps.hw_lock);
> if (dev_priv->rps.enabled) {
> - if (dev_priv->info->is_valleyview)
> + if (IS_VALLEYVIEW(dev))
> valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_delay);
> else
> gen6_set_rps(dev_priv->dev, dev_priv->rps.min_delay);
> @@ -3597,9 +3599,11 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv)
>
> void gen6_rps_boost(struct drm_i915_private *dev_priv)
> {
> + struct drm_device *dev = dev_priv->dev;
> +
> mutex_lock(&dev_priv->rps.hw_lock);
> if (dev_priv->rps.enabled) {
> - if (dev_priv->info->is_valleyview)
> + if (IS_VALLEYVIEW(dev))
> valleyview_set_rps(dev_priv->dev, dev_priv->rps.max_delay);
> else
> gen6_set_rps(dev_priv->dev, dev_priv->rps.max_delay);
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
