linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] panfrost: Properly undo pm_runtime_enable when deferring a probe
@ 2019-10-23 12:09 Tomeu Vizoso
  2019-10-23 12:21 ` [PATCH v2] " Tomeu Vizoso
  0 siblings, 1 reply; 6+ messages in thread
From: Tomeu Vizoso @ 2019-10-23 12:09 UTC (permalink / raw)
  To: linux-kernel
  Cc: Tomeu Vizoso, Robin Murphy, Rob Herring, David Airlie,
	Daniel Vetter, dri-devel

When deferring the probe because of a missing regulator, we were calling
pm_runtime_disable even if pm_runtime_enable wasn't called.

Move the call to pm_runtime_disable to the right place.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")
Cc: Robin Murphy <robin.murphy@arm.com>
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index bc2ddeb55f5d..f21bc8a7ee3a 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
 	return 0;
 
 err_out2:
+	pm_runtime_disable(pfdev->dev);
 	panfrost_devfreq_fini(pfdev);
 err_out1:
 	panfrost_device_fini(pfdev);
 err_out0:
-	pm_runtime_disable(pfdev->dev);
 	drm_dev_put(ddev);
 	return err;
 }
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2] panfrost: Properly undo pm_runtime_enable when deferring a probe
  2019-10-23 12:09 [PATCH] panfrost: Properly undo pm_runtime_enable when deferring a probe Tomeu Vizoso
@ 2019-10-23 12:21 ` Tomeu Vizoso
  2019-10-23 12:49   ` Robin Murphy
                     ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Tomeu Vizoso @ 2019-10-23 12:21 UTC (permalink / raw)
  To: linux-kernel
  Cc: Tomeu Vizoso, Chen-Yu Tsai, Robin Murphy, Rob Herring,
	David Airlie, Daniel Vetter, dri-devel

When deferring the probe because of a missing regulator, we were calling
pm_runtime_disable even if pm_runtime_enable wasn't called.

Move the call to pm_runtime_disable to the right place.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reported-by: Chen-Yu Tsai <wens@csie.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index bc2ddeb55f5d..f21bc8a7ee3a 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
 	return 0;
 
 err_out2:
+	pm_runtime_disable(pfdev->dev);
 	panfrost_devfreq_fini(pfdev);
 err_out1:
 	panfrost_device_fini(pfdev);
 err_out0:
-	pm_runtime_disable(pfdev->dev);
 	drm_dev_put(ddev);
 	return err;
 }
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] panfrost: Properly undo pm_runtime_enable when deferring a probe
  2019-10-23 12:21 ` [PATCH v2] " Tomeu Vizoso
@ 2019-10-23 12:49   ` Robin Murphy
  2019-10-23 15:49   ` Steven Price
  2019-10-24  3:51   ` Chen-Yu Tsai
  2 siblings, 0 replies; 6+ messages in thread
From: Robin Murphy @ 2019-10-23 12:49 UTC (permalink / raw)
  To: Tomeu Vizoso, linux-kernel
  Cc: Chen-Yu Tsai, Rob Herring, David Airlie, Daniel Vetter, dri-devel

On 2019-10-23 1:21 pm, Tomeu Vizoso wrote:
> When deferring the probe because of a missing regulator, we were calling
> pm_runtime_disable even if pm_runtime_enable wasn't called.
> 
> Move the call to pm_runtime_disable to the right place.
> 
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")

I think that commit was right at the time, but actually we missed 
reordering the cleanup path to match the change in 635430797d3f. 
Otherwise, though,

Reviewed-by: Robin Murphy <robin.murphy@arm.com>

> ---
>   drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index bc2ddeb55f5d..f21bc8a7ee3a 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
>   	return 0;
>   
>   err_out2:
> +	pm_runtime_disable(pfdev->dev);
>   	panfrost_devfreq_fini(pfdev);
>   err_out1:
>   	panfrost_device_fini(pfdev);
>   err_out0:
> -	pm_runtime_disable(pfdev->dev);
>   	drm_dev_put(ddev);
>   	return err;
>   }
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] panfrost: Properly undo pm_runtime_enable when deferring a probe
  2019-10-23 12:21 ` [PATCH v2] " Tomeu Vizoso
  2019-10-23 12:49   ` Robin Murphy
@ 2019-10-23 15:49   ` Steven Price
  2019-10-23 17:58     ` Rob Herring
  2019-10-24  3:51   ` Chen-Yu Tsai
  2 siblings, 1 reply; 6+ messages in thread
From: Steven Price @ 2019-10-23 15:49 UTC (permalink / raw)
  To: Tomeu Vizoso, linux-kernel
  Cc: David Airlie, dri-devel, Chen-Yu Tsai, Robin Murphy

On 23/10/2019 13:21, Tomeu Vizoso wrote:
> When deferring the probe because of a missing regulator, we were calling
> pm_runtime_disable even if pm_runtime_enable wasn't called.
> 
> Move the call to pm_runtime_disable to the right place.
> 
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")

As Robin pointed out this should be:

Fixes: 635430797d3f ("drm/panfrost: Rework runtime PM initialization")

But other than that,

Reviewed-by: Steven Price <steven.price@arm.com>

> ---
>  drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index bc2ddeb55f5d..f21bc8a7ee3a 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -556,11 +556,11 @@ static int panfrost_probe(struct platform_device *pdev)
>  	return 0;
>  
>  err_out2:
> +	pm_runtime_disable(pfdev->dev);
>  	panfrost_devfreq_fini(pfdev);
>  err_out1:
>  	panfrost_device_fini(pfdev);
>  err_out0:
> -	pm_runtime_disable(pfdev->dev);
>  	drm_dev_put(ddev);
>  	return err;
>  }
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] panfrost: Properly undo pm_runtime_enable when deferring a probe
  2019-10-23 15:49   ` Steven Price
@ 2019-10-23 17:58     ` Rob Herring
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2019-10-23 17:58 UTC (permalink / raw)
  To: Steven Price
  Cc: Tomeu Vizoso, linux-kernel, David Airlie, Chen-Yu Tsai,
	Robin Murphy, dri-devel

On Wed, Oct 23, 2019 at 10:49 AM Steven Price <steven.price@arm.com> wrote:
>
> On 23/10/2019 13:21, Tomeu Vizoso wrote:
> > When deferring the probe because of a missing regulator, we were calling
> > pm_runtime_disable even if pm_runtime_enable wasn't called.
> >
> > Move the call to pm_runtime_disable to the right place.
> >
> > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> > Reported-by: Chen-Yu Tsai <wens@csie.org>
> > Cc: Robin Murphy <robin.murphy@arm.com>
> > Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")
>
> As Robin pointed out this should be:
>
> Fixes: 635430797d3f ("drm/panfrost: Rework runtime PM initialization")
>
> But other than that,
>
> Reviewed-by: Steven Price <steven.price@arm.com>

Applied with Fixes fixed. Looks like we just missed this weeks fixes...

Rob

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] panfrost: Properly undo pm_runtime_enable when deferring a probe
  2019-10-23 12:21 ` [PATCH v2] " Tomeu Vizoso
  2019-10-23 12:49   ` Robin Murphy
  2019-10-23 15:49   ` Steven Price
@ 2019-10-24  3:51   ` Chen-Yu Tsai
  2 siblings, 0 replies; 6+ messages in thread
From: Chen-Yu Tsai @ 2019-10-24  3:51 UTC (permalink / raw)
  To: Tomeu Vizoso
  Cc: linux-kernel, Robin Murphy, Rob Herring, David Airlie,
	Daniel Vetter, dri-devel

On Wed, Oct 23, 2019 at 8:22 PM Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote:
>
> When deferring the probe because of a missing regulator, we were calling
> pm_runtime_disable even if pm_runtime_enable wasn't called.
>
> Move the call to pm_runtime_disable to the right place.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Fixes: f4a3c6a44b35 ("drm/panfrost: Disable PM on probe failure")

Tested-by: Chen-Yu Tsai <wens@csie.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-10-24  3:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-23 12:09 [PATCH] panfrost: Properly undo pm_runtime_enable when deferring a probe Tomeu Vizoso
2019-10-23 12:21 ` [PATCH v2] " Tomeu Vizoso
2019-10-23 12:49   ` Robin Murphy
2019-10-23 15:49   ` Steven Price
2019-10-23 17:58     ` Rob Herring
2019-10-24  3:51   ` Chen-Yu Tsai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).