drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()
authorBoris Brezillon <boris.brezillon@collabora.com>
Tue, 26 Mar 2024 11:12:05 +0000 (12:12 +0100)
committerBoris Brezillon <boris.brezillon@collabora.com>
Tue, 2 Apr 2024 07:33:49 +0000 (09:33 +0200)
There's no reason for _irq_suspend/resume() to be called after the
device has been unplugged, and keeping this dev_enter/exit()
section in _irq_suspend() is turns _irq_suspend() into a NOP
when called from the _unplug() functions, which we don't want.

v3:
- New patch

Fixes: 5fe909cae118 ("drm/panthor: Add the device logical block")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240326111205.510019-3-boris.brezillon@collabora.com
drivers/gpu/drm/panthor/panthor_device.h

index 8ced04dad3a8dfb70f7b7eed7ab6a3b38959cf45..dc3e9c666b5bd46ee14ca0d6aad308a47dac7b1a 100644 (file)
@@ -326,13 +326,8 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
        int cookie;                                                                             \
                                                                                                \
        pirq->mask = 0;                                                                         \
-                                                                                               \
-       if (drm_dev_enter(&pirq->ptdev->base, &cookie)) {                                       \
-               gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0);                           \
-               synchronize_irq(pirq->irq);                                                     \
-               drm_dev_exit(cookie);                                                           \
-       }                                                                                       \
-                                                                                               \
+       gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0);                                   \
+       synchronize_irq(pirq->irq);                                                             \
        atomic_set(&pirq->suspended, true);                                                     \
 }                                                                                              \
                                                                                                \
@@ -342,12 +337,8 @@ static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u
                                                                                                \
        atomic_set(&pirq->suspended, false);                                                    \
        pirq->mask = mask;                                                                      \
-                                                                                               \
-       if (drm_dev_enter(&pirq->ptdev->base, &cookie)) {                                       \
-               gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask);                       \
-               gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask);                        \
-               drm_dev_exit(cookie);                                                           \
-       }                                                                                       \
+       gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask);                               \
+       gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask);                                \
 }                                                                                              \
                                                                                                \
 static int panthor_request_ ## __name ## _irq(struct panthor_device *ptdev,                    \