niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()

Browse source 
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: 5fe909cae1 ("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
This commit is contained in:
Boris Brezillon 2024-03-26 12:12:05 +01:00
parent 1de434e0b2
commit 962f88b9c9
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/panthor/panthor_device.h
View file

@ -326,13 +326,8 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
int cookie; \ int cookie; \
\ \
pirq->mask = 0; \ pirq->mask = 0; \
\ gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
if (drm_dev_enter(&pirq->ptdev->base, &cookie)) { \ synchronize_irq(pirq->irq); \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
synchronize_irq(pirq->irq); \
drm_dev_exit(cookie); \
} \
\
atomic_set(&pirq->suspended, true); \ 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); \ atomic_set(&pirq->suspended, false); \
pirq->mask = mask; \ pirq->mask = mask; \
\ gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \
if (drm_dev_enter(&pirq->ptdev->base, &cookie)) { \ gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask); \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask); \
drm_dev_exit(cookie); \
} \
} \ } \
\ \
static int panthor_request_ ## __name ## _irq(struct panthor_device *ptdev, \ static int panthor_request_ ## __name ## _irq(struct panthor_device *ptdev, \