From: Jeff McGee Subject: Re: [PATCH] drm/i915/bdw: Add Broadwell support for debugfs rps freq info Date: Fri, 6 Jun 2014 10:15:21 -0500 Message-ID: <20140606151520.GA2577@jeffdesk> References: <20140526105029.GG14357@phenom.ffwll.local> <1401492130-61343-1-git-send-email-Tom.O'Rourke@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 65CF56EA75 for ; Fri, 6 Jun 2014 08:06:11 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1401492130-61343-1-git-send-email-Tom.O'Rourke@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tom.O'Rourke@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, May 30, 2014 at 04:22:10PM -0700, Tom.O'Rourke@intel.com wrote: > From: Tom O'Rourke > > Add Broadwell support to i915_frequency_info > and extend i915_max|min_freq_get|set to (gen >= 6). > > v2: generalized support for i915_max|min_freq_get|set (Daniel). > > Signed-off-by: Tom O'Rourke Reviewed-by: Jeff McGee > --- > drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 5858cbb..a75d57d 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1027,7 +1027,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused) > MEMSTAT_VID_SHIFT); > seq_printf(m, "Current P-state: %d\n", > (rgvstat & MEMSTAT_PSTATE_MASK) >> MEMSTAT_PSTATE_SHIFT); > - } else if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) { > + } else if (IS_GEN6(dev) > + || (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) > + || IS_BROADWELL(dev)) { > u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS); > u32 rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS); > u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP); > @@ -1046,7 +1048,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) > > reqf = I915_READ(GEN6_RPNSWREQ); > reqf &= ~GEN6_TURBO_DISABLE; > - if (IS_HASWELL(dev)) > + if (IS_HASWELL(dev) || IS_BROADWELL(dev)) > reqf >>= 24; > else > reqf >>= 25; > @@ -1063,7 +1065,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) > rpdownei = I915_READ(GEN6_RP_CUR_DOWN_EI); > rpcurdown = I915_READ(GEN6_RP_CUR_DOWN); > rpprevdown = I915_READ(GEN6_RP_PREV_DOWN); > - if (IS_HASWELL(dev)) > + if (IS_HASWELL(dev) || IS_BROADWELL(dev)) > cagf = (rpstat & HSW_CAGF_MASK) >> HSW_CAGF_SHIFT; > else > cagf = (rpstat & GEN6_CAGF_MASK) >> GEN6_CAGF_SHIFT; > @@ -3500,7 +3502,7 @@ i915_max_freq_get(void *data, u64 *val) > struct drm_i915_private *dev_priv = dev->dev_private; > int ret; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) > + if (INTEL_INFO(dev)->gen < 6) > return -ENODEV; > > flush_delayed_work(&dev_priv->rps.delayed_resume_work); > @@ -3526,7 +3528,7 @@ i915_max_freq_set(void *data, u64 val) > u32 rp_state_cap, hw_max, hw_min; > int ret; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) > + if (INTEL_INFO(dev)->gen < 6) > return -ENODEV; > > flush_delayed_work(&dev_priv->rps.delayed_resume_work); > @@ -3581,7 +3583,7 @@ i915_min_freq_get(void *data, u64 *val) > struct drm_i915_private *dev_priv = dev->dev_private; > int ret; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) > + if (INTEL_INFO(dev)->gen < 6) > return -ENODEV; > > flush_delayed_work(&dev_priv->rps.delayed_resume_work); > @@ -3607,7 +3609,7 @@ i915_min_freq_set(void *data, u64 val) > u32 rp_state_cap, hw_max, hw_min; > int ret; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) > + if (INTEL_INFO(dev)->gen < 6) > return -ENODEV; > > flush_delayed_work(&dev_priv->rps.delayed_resume_work); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx