57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From 962f88b9c91647f3ff4a0d3709662641baed5164 Mon Sep 17 00:00:00 2001
|
|
From: Boris Brezillon <boris.brezillon@collabora.com>
|
|
Date: Tue, 26 Mar 2024 12:12:05 +0100
|
|
Subject: [PATCH] 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
|
|
---
|
|
drivers/gpu/drm/panthor/panthor_device.h | 17 ++++-------------
|
|
1 file changed, 4 insertions(+), 13 deletions(-)
|
|
|
|
--- 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 ##
|
|
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 ##
|
|
\
|
|
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, \
|