All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/3] drm/i915/chv: remove pre-production hardware workarounds
Date: Wed, 7 Oct 2015 16:32:09 +0200	[thread overview]
Message-ID: <20151007143209.GO3383@phenom.ffwll.local> (raw)
In-Reply-To: <20151007132847.GI26517@intel.com>

On Wed, Oct 07, 2015 at 04:28:48PM +0300, Ville Syrjälä wrote:
> On Wed, Oct 07, 2015 at 11:17:46AM +0300, Jani Nikula wrote:
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 55 +++++++++++++++++------------------------
> >  1 file changed, 22 insertions(+), 33 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 60d120c472ab..598ee4c8d86e 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -5061,32 +5061,27 @@ static int cherryview_rps_max_freq(struct drm_i915_private *dev_priv)
> >  	struct drm_device *dev = dev_priv->dev;
> >  	u32 val, rp0;
> >  
> > -	if (dev->pdev->revision >= 0x20) {
> 
> Yep. C0 is the first production stepping.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Applied both patch 1&3 from this series, with gcc appeased on this patch
here.

Thanks, Daniel
> 
> > -		val = vlv_punit_read(dev_priv, FB_GFX_FMAX_AT_VMAX_FUSE);
> > +	val = vlv_punit_read(dev_priv, FB_GFX_FMAX_AT_VMAX_FUSE);
> >  
> > -		switch (INTEL_INFO(dev)->eu_total) {
> > -		case 8:
> > -				/* (2 * 4) config */
> > -				rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS4EU_FUSE_SHIFT);
> > -				break;
> > -		case 12:
> > -				/* (2 * 6) config */
> > -				rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS6EU_FUSE_SHIFT);
> > -				break;
> > -		case 16:
> > -				/* (2 * 8) config */
> > -		default:
> > -				/* Setting (2 * 8) Min RP0 for any other combination */
> > -				rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS8EU_FUSE_SHIFT);
> > -				break;
> > -		}
> > -		rp0 = (rp0 & FB_GFX_FREQ_FUSE_MASK);
> > -	} else {
> > -		/* For pre-production hardware */
> > -		val = vlv_punit_read(dev_priv, PUNIT_GPU_STATUS_REG);
> > -		rp0 = (val >> PUNIT_GPU_STATUS_MAX_FREQ_SHIFT) &
> > -		       PUNIT_GPU_STATUS_MAX_FREQ_MASK;
> > +	switch (INTEL_INFO(dev)->eu_total) {
> > +	case 8:
> > +		/* (2 * 4) config */
> > +		rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS4EU_FUSE_SHIFT);
> > +		break;
> > +	case 12:
> > +		/* (2 * 6) config */
> > +		rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS6EU_FUSE_SHIFT);
> > +		break;
> > +	case 16:
> > +		/* (2 * 8) config */
> > +	default:
> > +		/* Setting (2 * 8) Min RP0 for any other combination */
> > +		rp0 = (val >> FB_GFX_FMAX_AT_VMAX_2SS8EU_FUSE_SHIFT);
> > +		break;
> >  	}
> > +
> > +	rp0 = (rp0 & FB_GFX_FREQ_FUSE_MASK);
> > +
> >  	return rp0;
> >  }
> >  
> > @@ -5105,15 +5100,9 @@ static int cherryview_rps_guar_freq(struct drm_i915_private *dev_priv)
> >  	struct drm_device *dev = dev_priv->dev;
> >  	u32 val, rp1;
> >  
> > -	if (dev->pdev->revision >= 0x20) {
> > -		val = vlv_punit_read(dev_priv, FB_GFX_FMAX_AT_VMAX_FUSE);
> > -		rp1 = (val & FB_GFX_FREQ_FUSE_MASK);
> > -	} else {
> > -		/* For pre-production hardware */
> > -		val = vlv_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS);
> > -		rp1 = ((val >> PUNIT_GPU_STATUS_MAX_FREQ_SHIFT) &
> > -		       PUNIT_GPU_STATUS_MAX_FREQ_MASK);
> > -	}
> > +	val = vlv_punit_read(dev_priv, FB_GFX_FMAX_AT_VMAX_FUSE);
> > +	rp1 = (val & FB_GFX_FREQ_FUSE_MASK);
> > +
> >  	return rp1;
> >  }
> >  
> > -- 
> > 2.1.4
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-10-07 14:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-07  8:17 [PATCH 1/3] drm/i915/snb: remove pre-production hardware workaround Jani Nikula
2015-10-07  8:17 ` [PATCH 2/3] drm/i915/vlv: " Jani Nikula
2015-10-07 13:27   ` Ville Syrjälä
2015-10-07 14:30     ` Daniel Vetter
2015-10-07 15:35       ` Ville Syrjälä
2015-10-07  8:17 ` [PATCH 3/3] drm/i915/chv: remove pre-production hardware workarounds Jani Nikula
2015-10-07  8:31   ` kbuild test robot
2015-10-07 13:28   ` Ville Syrjälä
2015-10-07 14:32     ` Daniel Vetter [this message]
2015-10-07 13:23 ` [PATCH 1/3] drm/i915/snb: remove pre-production hardware workaround Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151007143209.GO3383@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=ville.syrjala@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.