diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2024-03-26 12:12:05 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@collabora.com> | 2024-04-02 09:33:49 +0200 |
| commit | 962f88b9c91647f3ff4a0d3709662641baed5164 (patch) | |
| tree | 4dbf318a0f07cf3ac41625f1294739403c8fdba0 /drivers/gpu/drm/panthor | |
| parent | 1de434e0b2757061b09b347264f1ff5bdf996e58 (diff) | |
| download | lwn-962f88b9c91647f3ff4a0d3709662641baed5164.tar.gz lwn-962f88b9c91647f3ff4a0d3709662641baed5164.zip | |
drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()
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
Diffstat (limited to 'drivers/gpu/drm/panthor')
| -rw-r--r-- | drivers/gpu/drm/panthor/panthor_device.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h index 8ced04dad3a8..dc3e9c666b5b 100644 --- a/drivers/gpu/drm/panthor/panthor_device.h +++ b/drivers/gpu/drm/panthor/panthor_device.h @@ -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, \ |