From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/8] drm/i915: Use IS_VALLEYVIEW() to test the is_valleyview flag Date: Tue, 17 Dec 2013 10:38:48 +0100 Message-ID: <20131217093848.GO9804@phenom.ffwll.local> References: <1386859003-17246-1-git-send-email-damien.lespiau@intel.com> <1386859003-17246-2-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 3649F10592E for ; Tue, 17 Dec 2013 01:37:55 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c41so2722049eek.22 for ; Tue, 17 Dec 2013 01:37:54 -0800 (PST) Content-Disposition: inline In-Reply-To: <1386859003-17246-2-git-send-email-damien.lespiau@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Damien Lespiau Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Dec 12, 2013 at 02:36:36PM +0000, Damien Lespiau wrote: > Signed-off-by: Damien Lespiau 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@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch