[PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
appropriately (eg. doesn't limit rps values to even numbers).

Fix a typo in the w/a name while at it.

Cc: Deepak S <deepak.s@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 8a54870..6d5ae82 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -4692,8 +4692,8 @@ void intel_irq_init(struct drm_device *dev)
 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
 
 	/* Let's track the enabled rps events */
-	if (IS_VALLEYVIEW(dev))
-		/* WaGsvRC0ResidenncyMethod:VLV */
+	if (IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev))
+		/* WaGsvRC0ResidencyMethod:vlv */
 		dev_priv->pm_rps_events = GEN6_PM_RP_UP_EI_EXPIRED;
 	else
 		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
-- 
1.8.5.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Chris Wilson]

On Fri, Aug 29, 2014 at 02:14:07PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
> appropriately (eg. doesn't limit rps values to even numbers).
> 
> Fix a typo in the w/a name while at it.

You could review my changes for the vlv manual calculations that would
fix it for chv as well...
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Ville Syrjälä]

On Fri, Aug 29, 2014 at 12:21:27PM +0100, Chris Wilson wrote:
> On Fri, Aug 29, 2014 at 02:14:07PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
> > appropriately (eg. doesn't limit rps values to even numbers).
> > 
> > Fix a typo in the w/a name while at it.
> 
> You could review my changes for the vlv manual calculations that would
> fix it for chv as well...

IIRC I glanced at them but there was too much noise in some of the
patches for my poor brain so I gave up.

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Chris Wilson]

On Fri, Aug 29, 2014 at 03:09:49PM +0300, Ville Syrjälä wrote:
> On Fri, Aug 29, 2014 at 12:21:27PM +0100, Chris Wilson wrote:
> > On Fri, Aug 29, 2014 at 02:14:07PM +0300, ville.syrjala@linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > 
> > > WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
> > > appropriately (eg. doesn't limit rps values to even numbers).
> > > 
> > > Fix a typo in the w/a name while at it.
> > 
> > You could review my changes for the vlv manual calculations that would
> > fix it for chv as well...
> 
> IIRC I glanced at them but there was too much noise in some of the
> patches for my poor brain so I gave up.

Could you clarify whether you mean WaGsvRC0ResidenncyMethod is only
intended for vlv (fixed for chv), or whether just the implementation is
currently only for chv.

If the former, and the code is no longer required,
Reviewed-by: Chris Wilson <chris@chris-wilson.o.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Ville Syrjälä]

On Fri, Aug 29, 2014 at 01:51:04PM +0100, Chris Wilson wrote:
> On Fri, Aug 29, 2014 at 03:09:49PM +0300, Ville Syrjälä wrote:
> > On Fri, Aug 29, 2014 at 12:21:27PM +0100, Chris Wilson wrote:
> > > On Fri, Aug 29, 2014 at 02:14:07PM +0300, ville.syrjala@linux.intel.com wrote:
> > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > 
> > > > WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
> > > > appropriately (eg. doesn't limit rps values to even numbers).
> > > > 
> > > > Fix a typo in the w/a name while at it.
> > > 
> > > You could review my changes for the vlv manual calculations that would
> > > fix it for chv as well...
> > 
> > IIRC I glanced at them but there was too much noise in some of the
> > patches for my poor brain so I gave up.
> 
> Could you clarify whether you mean WaGsvRC0ResidenncyMethod is only
> intended for vlv (fixed for chv), or whether just the implementation is
> currently only for chv.

At least the w/a isn't listed for chv currently.

> 
> If the former, and the code is no longer required,
> Reviewed-by: Chris Wilson <chris@chris-wilson.o.uk>
> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Deepak S]

On Friday 29 August 2014 04:51 PM, Chris Wilson wrote:
> On Fri, Aug 29, 2014 at 02:14:07PM +0300, ville.syrjala@linux.intel.com wrote:
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>
>> WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
>> appropriately (eg. doesn't limit rps values to even numbers).
>>
>> Fix a typo in the w/a name while at it.
> You could review my changes for the vlv manual calculations that would
> fix it for chv as well...
> -Chris

Hi Chris,
I have reviewed your patch. It should directly work for CHV. We still need Ville patch, as "WaGsvRC0ResidenncyMethod (EI_expired)" interrupts are not needed for chv.
I can test your patch on CHV, if someone else can test you patch on VLV, i can add my r-b
Thanks
Deepak

Re: [PATCH] drm/i915: Don't use WaGsvRC0ResidenncyMethod on chv

[Deepak S]

On Friday 29 August 2014 04:44 PM, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> WaGsvRC0ResidenncyMethod is for vlv, it doesn't deal with chv
> appropriately (eg. doesn't limit rps values to even numbers).
>
> Fix a typo in the w/a name while at it.
>
> Cc: Deepak S <deepak.s@linux.intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>   drivers/gpu/drm/i915/i915_irq.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 8a54870..6d5ae82 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -4692,8 +4692,8 @@ void intel_irq_init(struct drm_device *dev)
>   	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
>   
>   	/* Let's track the enabled rps events */
> -	if (IS_VALLEYVIEW(dev))
> -		/* WaGsvRC0ResidenncyMethod:VLV */
> +	if (IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev))
> +		/* WaGsvRC0ResidencyMethod:vlv */
>   		dev_priv->pm_rps_events = GEN6_PM_RP_UP_EI_EXPIRED;
>   	else
>   		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
>
Reviewed-by: Deepak S <deepak.s@linux.intel.com>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx