On Mon, 14 Apr 2025 15:01:20 +0200
Boris Brezillon <boris.brezil...@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.carpen...@linaro.org>
> Closes:
> https://lore.kernel.org/dri-devel/4da470aa-4f84-460e-aff8-dabc8cc4da15@stanley.mountain/T/#t
> Signed-off-by: Boris Brezillon <boris.brezil...@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)
