[PATCH] drm/panthor: Fix the panthor_gpu_coherency_init() error path

[PATCH] drm/panthor: Fix the panthor_gpu_coherency_init() error path

[Boris Brezillon]

The panthor_gpu_coherency_init() call has been moved around, but the
error path hasn't been adjusted accordingly. Make sure we undo what
has been done before this call in case of failure.

Fixes: 7d5a3b22f5b5 ("drm/panthor: Call panthor_gpu_coherency_init() after PM resume()")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
 drivers/gpu/drm/panthor/panthor_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
index c73c1608d6e6..1e8811c6716d 100644
--- a/drivers/gpu/drm/panthor/panthor_device.c
+++ b/drivers/gpu/drm/panthor/panthor_device.c
@@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev)
 
 	ret = panthor_gpu_coherency_init(ptdev);
 	if (ret)
-		return ret;
+		goto err_unplug_gpu;
 
 	ret = panthor_mmu_init(ptdev);
 	if (ret)
-- 
2.49.0

Re: [PATCH] drm/panthor: Fix the panthor_gpu_coherency_init() error path

[Liviu Dudau]

On Mon, Apr 14, 2025 at 03:01:20PM +0200, Boris Brezillon wrote:
> The panthor_gpu_coherency_init() call has been moved around, but the
> error path hasn't been adjusted accordingly. Make sure we undo what
> has been done before this call in case of failure.
> 
> Fixes: 7d5a3b22f5b5 ("drm/panthor: Call panthor_gpu_coherency_init() after PM resume()")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

Good catch!

Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>

Best regards,
Liviu

> ---
>  drivers/gpu/drm/panthor/panthor_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
> index c73c1608d6e6..1e8811c6716d 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.c
> +++ b/drivers/gpu/drm/panthor/panthor_device.c
> @@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev)
>  
>  	ret = panthor_gpu_coherency_init(ptdev);
>  	if (ret)
> -		return ret;
> +		goto err_unplug_gpu;
>  
>  	ret = panthor_mmu_init(ptdev);
>  	if (ret)
> -- 
> 2.49.0
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

Re: [PATCH] drm/panthor: Fix the panthor_gpu_coherency_init() error path

[Steven Price]

On 14/04/2025 14:01, Boris Brezillon wrote:
> The panthor_gpu_coherency_init() call has been moved around, but the
> error path hasn't been adjusted accordingly. Make sure we undo what
> has been done before this call in case of failure.
> 
> Fixes: 7d5a3b22f5b5 ("drm/panthor: Call panthor_gpu_coherency_init() after PM resume()")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

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

> ---
>  drivers/gpu/drm/panthor/panthor_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
> index c73c1608d6e6..1e8811c6716d 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.c
> +++ b/drivers/gpu/drm/panthor/panthor_device.c
> @@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev)
>  
>  	ret = panthor_gpu_coherency_init(ptdev);
>  	if (ret)
> -		return ret;
> +		goto err_unplug_gpu;
>  
>  	ret = panthor_mmu_init(ptdev);
>  	if (ret)

Re: [PATCH] drm/panthor: Fix the panthor_gpu_coherency_init() error path

[Boris Brezillon]

On Mon, 14 Apr 2025 15:01:20 +0200
Boris Brezillon <boris.brezillon@collabora.com> wrote:

> The panthor_gpu_coherency_init() call has been moved around, but the
> error path hasn't been adjusted accordingly. Make sure we undo what
> has been done before this call in case of failure.
> 
> Fixes: 7d5a3b22f5b5 ("drm/panthor: Call panthor_gpu_coherency_init() after PM resume()")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

Queued to drm-misc-next.

> ---
>  drivers/gpu/drm/panthor/panthor_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
> index c73c1608d6e6..1e8811c6716d 100644
> --- a/drivers/gpu/drm/panthor/panthor_device.c
> +++ b/drivers/gpu/drm/panthor/panthor_device.c
> @@ -245,7 +245,7 @@ int panthor_device_init(struct panthor_device *ptdev)
>  
>  	ret = panthor_gpu_coherency_init(ptdev);
>  	if (ret)
> -		return ret;
> +		goto err_unplug_gpu;
>  
>  	ret = panthor_mmu_init(ptdev);
>  	if (ret)