drm/panthor: Fix the panthor_gpu_coherency_init() error path
authorBoris Brezillon <boris.brezillon@collabora.com>
Mon, 14 Apr 2025 13:01:20 +0000 (15:01 +0200)
committerBoris Brezillon <boris.brezillon@collabora.com>
Thu, 17 Apr 2025 09:29:49 +0000 (11:29 +0200)
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
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Link: https://lore.kernel.org/r/20250414130120.581274-1-boris.brezillon@collabora.com
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
drivers/gpu/drm/panthor/panthor_device.c

index c73c1608d6e68c1f083cca19674a2f069a0f8554..1e8811c6716dfab756e1ba4d5030660afdc8da2f 100644 (file)
@@ -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)