github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/panthor: Rework panthor_irq::suspended into panthor_irq::state

Browse Source 
To deal with the threaded interrupt handler and a suspend action
overlapping, the boolean panthor_irq::suspended is not sufficient.

Rework it into taking several different values depending on the current
state, and check it and set it within the IRQ helper functions.

Co-developed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patch.msgid.link/20260116-panthor-tracepoints-v10-1-d925986e3d1b@collabora.com
This commit is contained in:
Nicolas Frattaroli 2026-01-16 13:57:30 +01:00 committed by Boris Brezillon
parent 68b271a3a9
commit 0b2d86670a
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/gpu/drm/panthor/panthor_device.h
View File

@ -61,6 +61,17 @@ enum panthor_device_pm_state {
PANTHOR_DEVICE_PM_STATE_SUSPENDING, PANTHOR_DEVICE_PM_STATE_SUSPENDING,
}; };
enum panthor_irq_state {
/** @PANTHOR_IRQ_STATE_ACTIVE: IRQ is active and ready to process events. */
PANTHOR_IRQ_STATE_ACTIVE = 0,
/** @PANTHOR_IRQ_STATE_PROCESSING: IRQ is currently processing events. */
PANTHOR_IRQ_STATE_PROCESSING,
/** @PANTHOR_IRQ_STATE_SUSPENDED: IRQ is suspended. */
PANTHOR_IRQ_STATE_SUSPENDED,
/** @PANTHOR_IRQ_STATE_SUSPENDING: IRQ is being suspended. */
PANTHOR_IRQ_STATE_SUSPENDING,
};
/** /**
* struct panthor_irq - IRQ data * struct panthor_irq - IRQ data
* *
@ -76,8 +87,8 @@ struct panthor_irq {
/** @mask: Current mask being applied to xxx_INT_MASK. */ /** @mask: Current mask being applied to xxx_INT_MASK. */
u32 mask; u32 mask;
/** @suspended: Set to true when the IRQ is suspended. */ /** @state: one of &enum panthor_irq_state reflecting the current state. */
atomic_t suspended; atomic_t state;
}; };
/** /**
@ -409,12 +420,17 @@ static irqreturn_t panthor_ ## __name ## _irq_raw_handler(int irq, void *data)
{ \ { \
struct panthor_irq *pirq = data; \ struct panthor_irq *pirq = data; \
struct panthor_device *ptdev = pirq->ptdev; \ struct panthor_device *ptdev = pirq->ptdev; \
enum panthor_irq_state old_state; \
\ \
if (atomic_read(&pirq->suspended)) \
return IRQ_NONE; \
if (!gpu_read(ptdev, __reg_prefix ## _INT_STAT)) \ if (!gpu_read(ptdev, __reg_prefix ## _INT_STAT)) \
return IRQ_NONE; \ return IRQ_NONE; \
\ \
old_state = atomic_cmpxchg(&pirq->state, \
PANTHOR_IRQ_STATE_ACTIVE, \
PANTHOR_IRQ_STATE_PROCESSING); \
if (old_state != PANTHOR_IRQ_STATE_ACTIVE) \
return IRQ_NONE; \
\
gpu_write(ptdev, __reg_prefix ## _INT_MASK, 0); \ gpu_write(ptdev, __reg_prefix ## _INT_MASK, 0); \
return IRQ_WAKE_THREAD; \ return IRQ_WAKE_THREAD; \
} \ } \
@ -423,6 +439,7 @@ static irqreturn_t panthor_ ## __name ## _irq_threaded_handler(int irq, void *da
{ \ { \
struct panthor_irq *pirq = data; \ struct panthor_irq *pirq = data; \
struct panthor_device *ptdev = pirq->ptdev; \ struct panthor_device *ptdev = pirq->ptdev; \
enum panthor_irq_state old_state; \
irqreturn_t ret = IRQ_NONE; \ irqreturn_t ret = IRQ_NONE; \
\ \
while (true) { \ while (true) { \
@ -435,7 +452,10 @@ static irqreturn_t panthor_ ## __name ## _irq_threaded_handler(int irq, void *da
ret = IRQ_HANDLED; \ ret = IRQ_HANDLED; \
} \ } \
\ \
if (!atomic_read(&pirq->suspended)) \ old_state = atomic_cmpxchg(&pirq->state, \
PANTHOR_IRQ_STATE_PROCESSING, \
PANTHOR_IRQ_STATE_ACTIVE); \
if (old_state == PANTHOR_IRQ_STATE_PROCESSING) \
gpu_write(ptdev, __reg_prefix ## _INT_MASK, pirq->mask); \ gpu_write(ptdev, __reg_prefix ## _INT_MASK, pirq->mask); \
\ \
return ret; \ return ret; \
@ -445,14 +465,15 @@ static inline void panthor_ ## __name ## _irq_suspend(struct panthor_irq *pirq)
{ \ { \
pirq->mask = 0; \ pirq->mask = 0; \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \ gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, 0); \
atomic_set(&pirq->state, PANTHOR_IRQ_STATE_SUSPENDING); \
synchronize_irq(pirq->irq); \ synchronize_irq(pirq->irq); \
atomic_set(&pirq->suspended, true); \ atomic_set(&pirq->state, PANTHOR_IRQ_STATE_SUSPENDED); \
} \ } \
\ \
static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u32 mask) \ static inline void panthor_ ## __name ## _irq_resume(struct panthor_irq *pirq, u32 mask) \
{ \ { \
atomic_set(&pirq->suspended, false); \
pirq->mask = mask; \ pirq->mask = mask; \
atomic_set(&pirq->state, PANTHOR_IRQ_STATE_ACTIVE); \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \ gpu_write(pirq->ptdev, __reg_prefix ## _INT_CLEAR, mask); \
gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask); \ gpu_write(pirq->ptdev, __reg_prefix ## _INT_MASK, mask); \
} \ } \