* [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending
@ 2014-09-04 21:07 Paulo Zanoni
2014-09-05 8:46 ` Daniel Vetter
2014-09-05 13:00 ` Paulo Zanoni
0 siblings, 2 replies; 5+ messages in thread
From: Paulo Zanoni @ 2014-09-04 21:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
If we don't cancel them, we may end up running them while the device
is runtime suspended, which will trigger lots and lots of WARNs on
dmesg.
Regression introduced by:
commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca
Author: Daisy Sun <daisy.sun@intel.com>
Date: Mon Aug 11 11:08:38 2014 -0700
drm/i915/bdw: BDW Software Turbo
Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8ff3755..4ce217b 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1448,6 +1448,10 @@ static int intel_runtime_suspend(struct device *device)
* intel_mark_idle().
*/
cancel_work_sync(&dev_priv->rps.work);
+ if (dev_priv->rps.is_bdw_sw_turbo) {
+ del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
+ cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
+ }
intel_runtime_pm_disable_interrupts(dev);
ret = intel_suspend_complete(dev_priv);
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending
2014-09-04 21:07 [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending Paulo Zanoni
@ 2014-09-05 8:46 ` Daniel Vetter
2014-09-05 13:00 ` Paulo Zanoni
1 sibling, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2014-09-05 8:46 UTC (permalink / raw)
To: Paulo Zanoni; +Cc: intel-gfx, Paulo Zanoni
On Thu, Sep 04, 2014 at 06:07:02PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>
> If we don't cancel them, we may end up running them while the device
> is runtime suspended, which will trigger lots and lots of WARNs on
> dmesg.
>
> Regression introduced by:
> commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca
> Author: Daisy Sun <daisy.sun@intel.com>
> Date: Mon Aug 11 11:08:38 2014 -0700
> drm/i915/bdw: BDW Software Turbo
>
> Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times)
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Please don't forget to cc relevant people when you fix a regression.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 8ff3755..4ce217b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1448,6 +1448,10 @@ static int intel_runtime_suspend(struct device *device)
> * intel_mark_idle().
> */
> cancel_work_sync(&dev_priv->rps.work);
> + if (dev_priv->rps.is_bdw_sw_turbo) {
> + del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
> + cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
> + }
> intel_runtime_pm_disable_interrupts(dev);
>
> ret = intel_suspend_complete(dev_priv);
> --
> 2.1.0
>
> _______________________________________________
> 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] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending
2014-09-04 21:07 [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending Paulo Zanoni
2014-09-05 8:46 ` Daniel Vetter
@ 2014-09-05 13:00 ` Paulo Zanoni
2014-09-09 1:55 ` Sun, Daisy
1 sibling, 1 reply; 5+ messages in thread
From: Paulo Zanoni @ 2014-09-05 13:00 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Paulo Zanoni
(adding Daisy Sun to the conversation)
2014-09-04 18:07 GMT-03:00 Paulo Zanoni <przanoni@gmail.com>:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>
> If we don't cancel them, we may end up running them while the device
> is runtime suspended, which will trigger lots and lots of WARNs on
> dmesg.
>
> Regression introduced by:
> commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca
> Author: Daisy Sun <daisy.sun@intel.com>
> Date: Mon Aug 11 11:08:38 2014 -0700
> drm/i915/bdw: BDW Software Turbo
>
> Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times)
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 8ff3755..4ce217b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1448,6 +1448,10 @@ static int intel_runtime_suspend(struct device *device)
> * intel_mark_idle().
> */
> cancel_work_sync(&dev_priv->rps.work);
> + if (dev_priv->rps.is_bdw_sw_turbo) {
> + del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
> + cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
> + }
> intel_runtime_pm_disable_interrupts(dev);
>
> ret = intel_suspend_complete(dev_priv);
> --
> 2.1.0
>
--
Paulo Zanoni
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending
2014-09-05 13:00 ` Paulo Zanoni
@ 2014-09-09 1:55 ` Sun, Daisy
2014-09-17 14:25 ` Paulo Zanoni
0 siblings, 1 reply; 5+ messages in thread
From: Sun, Daisy @ 2014-09-09 1:55 UTC (permalink / raw)
To: Paulo Zanoni, Intel Graphics Development; +Cc: Paulo Zanoni
Need to reset the flip_received flag at the end of this block, indicate
that the flip interrupt will stop working.
+ if (dev_priv->rps.is_bdw_sw_turbo) {
+ del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
+ cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
+ atomic_set(&dev_priv->rps.sw_turbo.flip_received, false);
+ }
- Daisy
On 9/5/2014 6:00 AM, Paulo Zanoni wrote:
> (adding Daisy Sun to the conversation)
>
> 2014-09-04 18:07 GMT-03:00 Paulo Zanoni <przanoni@gmail.com>:
>> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>
>> If we don't cancel them, we may end up running them while the device
>> is runtime suspended, which will trigger lots and lots of WARNs on
>> dmesg.
>>
>> Regression introduced by:
>> commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca
>> Author: Daisy Sun <daisy.sun@intel.com>
>> Date: Mon Aug 11 11:08:38 2014 -0700
>> drm/i915/bdw: BDW Software Turbo
>>
>> Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times)
>> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_drv.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 8ff3755..4ce217b 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1448,6 +1448,10 @@ static int intel_runtime_suspend(struct device *device)
>> * intel_mark_idle().
>> */
>> cancel_work_sync(&dev_priv->rps.work);
>> + if (dev_priv->rps.is_bdw_sw_turbo) {
>> + del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
>> + cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
>> + }
>> intel_runtime_pm_disable_interrupts(dev);
>>
>> ret = intel_suspend_complete(dev_priv);
>> --
>> 2.1.0
>>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending
2014-09-09 1:55 ` Sun, Daisy
@ 2014-09-17 14:25 ` Paulo Zanoni
0 siblings, 0 replies; 5+ messages in thread
From: Paulo Zanoni @ 2014-09-17 14:25 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
If we don't cancel them, we may end up running them while the device
is runtime suspended, which will trigger lots and lots of WARNs on
dmesg.
Regression introduced by:
commit c76bb61a71083b2d90504cc6d0dda2047c5d63ca
Author: Daisy Sun <daisy.sun@intel.com>
Date: Mon Aug 11 11:08:38 2014 -0700
drm/i915/bdw: BDW Software Turbo
v2: Also set flip_received to false (Daisy)
Testcase: igt/pm_rpm/gem-execbuf (you may have to run it a few times)
Cc: Daisy Sun <daisy.sun@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b8bd008..857f0f9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1447,6 +1447,11 @@ static int intel_runtime_suspend(struct device *device)
* intel_mark_idle().
*/
cancel_work_sync(&dev_priv->rps.work);
+ if (dev_priv->rps.is_bdw_sw_turbo) {
+ del_timer_sync(&dev_priv->rps.sw_turbo.flip_timer);
+ cancel_work_sync(&dev_priv->rps.sw_turbo.work_max_freq);
+ atomic_set(&dev_priv->rps.sw_turbo.flip_received, false);
+ }
intel_runtime_pm_disable_interrupts(dev);
ret = intel_suspend_complete(dev_priv);
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-17 14:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-04 21:07 [PATCH] drm/i915/bdw: cancel the SW turbo tasks before runtime suspending Paulo Zanoni
2014-09-05 8:46 ` Daniel Vetter
2014-09-05 13:00 ` Paulo Zanoni
2014-09-09 1:55 ` Sun, Daisy
2014-09-17 14:25 ` Paulo Zanoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox