All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Reset RPS events when enabling RPS
@ 2014-09-10 12:01 Chris Wilson
  2014-09-10 12:20 ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2014-09-10 12:01 UTC (permalink / raw)
  To: intel-gfx

After a GPU reset, we reinitialize RPS and RC6 state. (This may be
unnecessary, they be preserved across the reset anyway...) Given that
the GPU was active before the reset, it is likely that we do have a
pending RPS work item and so we should simply disable it rather than
emit a warn.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_pm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9afdeed..3dea174 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3694,7 +3694,7 @@ static void gen8_enable_rps_interrupts(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	spin_lock_irq(&dev_priv->irq_lock);
-	WARN_ON(dev_priv->rps.pm_iir);
+	dev_priv->rps.pm_iir = 0;
 	gen8_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
 	I915_WRITE(GEN8_GT_IIR(2), dev_priv->rps.pm_events);
 	spin_unlock_irq(&dev_priv->irq_lock);
@@ -3705,7 +3705,7 @@ static void gen6_enable_rps_interrupts(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	spin_lock_irq(&dev_priv->irq_lock);
-	WARN_ON(dev_priv->rps.pm_iir);
+	dev_priv->rps.pm_iir = 0;
 	gen6_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
 	I915_WRITE(GEN6_PMIIR, dev_priv->rps.pm_events);
 	spin_unlock_irq(&dev_priv->irq_lock);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Reset RPS events when enabling RPS
  2014-09-10 12:01 [PATCH] drm/i915: Reset RPS events when enabling RPS Chris Wilson
@ 2014-09-10 12:20 ` Daniel Vetter
  2015-01-21 19:23   ` Jani Nikula
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2014-09-10 12:20 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

On Wed, Sep 10, 2014 at 01:01:58PM +0100, Chris Wilson wrote:
> After a GPU reset, we reinitialize RPS and RC6 state. (This may be
> unnecessary, they be preserved across the reset anyway...) Given that
> the GPU was active before the reset, it is likely that we do have a
> pending RPS work item and so we should simply disable it rather than
> emit a warn.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

This regression has been introduced in

commit dd0a1aa19bd3d7203e58157b84cea78bbac605ac
Author: Jeff McGee <jeff.mcgee@intel.com>
Date:   Tue Feb 4 11:32:31 2014 -0600

    drm/i915: Restore rps/rc6 on reset

Cc: Jeff McGee <jeff.mcgee@intel.com>
Cc: stable@vger.kernel.org (under the assumption that it blew up in
reality and this isn't just a code audit exercise).

Adding Jeff.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 9afdeed..3dea174 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3694,7 +3694,7 @@ static void gen8_enable_rps_interrupts(struct drm_device *dev)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  
>  	spin_lock_irq(&dev_priv->irq_lock);
> -	WARN_ON(dev_priv->rps.pm_iir);
> +	dev_priv->rps.pm_iir = 0;
>  	gen8_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
>  	I915_WRITE(GEN8_GT_IIR(2), dev_priv->rps.pm_events);
>  	spin_unlock_irq(&dev_priv->irq_lock);
> @@ -3705,7 +3705,7 @@ static void gen6_enable_rps_interrupts(struct drm_device *dev)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  
>  	spin_lock_irq(&dev_priv->irq_lock);
> -	WARN_ON(dev_priv->rps.pm_iir);
> +	dev_priv->rps.pm_iir = 0;
>  	gen6_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
>  	I915_WRITE(GEN6_PMIIR, dev_priv->rps.pm_events);
>  	spin_unlock_irq(&dev_priv->irq_lock);
> -- 
> 1.9.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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Reset RPS events when enabling RPS
  2014-09-10 12:20 ` Daniel Vetter
@ 2015-01-21 19:23   ` Jani Nikula
  0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2015-01-21 19:23 UTC (permalink / raw)
  To: Daniel Vetter, Chris Wilson; +Cc: intel-gfx

On Wed, 10 Sep 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Sep 10, 2014 at 01:01:58PM +0100, Chris Wilson wrote:
>> After a GPU reset, we reinitialize RPS and RC6 state. (This may be
>> unnecessary, they be preserved across the reset anyway...) Given that
>> the GPU was active before the reset, it is likely that we do have a
>> pending RPS work item and so we should simply disable it rather than
>> emit a warn.
>> 
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> This regression has been introduced in
>
> commit dd0a1aa19bd3d7203e58157b84cea78bbac605ac
> Author: Jeff McGee <jeff.mcgee@intel.com>
> Date:   Tue Feb 4 11:32:31 2014 -0600
>
>     drm/i915: Restore rps/rc6 on reset
>
> Cc: Jeff McGee <jeff.mcgee@intel.com>
> Cc: stable@vger.kernel.org (under the assumption that it blew up in
> reality and this isn't just a code audit exercise).

I seem to have neglected this patch, and it no longer
applies. Sorry. The warn seems to be still in place, please refresh the
patch if the fix itself is still valid.

Apologies and thanks,
Jani.

>
> Adding Jeff.
> -Daniel
>
>> ---
>>  drivers/gpu/drm/i915/intel_pm.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 9afdeed..3dea174 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -3694,7 +3694,7 @@ static void gen8_enable_rps_interrupts(struct drm_device *dev)
>>  	struct drm_i915_private *dev_priv = dev->dev_private;
>>  
>>  	spin_lock_irq(&dev_priv->irq_lock);
>> -	WARN_ON(dev_priv->rps.pm_iir);
>> +	dev_priv->rps.pm_iir = 0;
>>  	gen8_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
>>  	I915_WRITE(GEN8_GT_IIR(2), dev_priv->rps.pm_events);
>>  	spin_unlock_irq(&dev_priv->irq_lock);
>> @@ -3705,7 +3705,7 @@ static void gen6_enable_rps_interrupts(struct drm_device *dev)
>>  	struct drm_i915_private *dev_priv = dev->dev_private;
>>  
>>  	spin_lock_irq(&dev_priv->irq_lock);
>> -	WARN_ON(dev_priv->rps.pm_iir);
>> +	dev_priv->rps.pm_iir = 0;
>>  	gen6_enable_pm_irq(dev_priv, dev_priv->rps.pm_events);
>>  	I915_WRITE(GEN6_PMIIR, dev_priv->rps.pm_events);
>>  	spin_unlock_irq(&dev_priv->irq_lock);
>> -- 
>> 1.9.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
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-21 19:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-10 12:01 [PATCH] drm/i915: Reset RPS events when enabling RPS Chris Wilson
2014-09-10 12:20 ` Daniel Vetter
2015-01-21 19:23   ` Jani Nikula

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.