* [PATCH v2] drm/mediatek: dsi: Don't let a signal cut the IRQ wait short
@ 2026-11-18 9:33 Zi-Hao Huang via B4 Relay
2026-11-18 12:32 ` AngeloGioacchino Del Regno
0 siblings, 1 reply; 2+ messages in thread
From: Zi-Hao Huang via B4 Relay @ 2026-11-18 9:33 UTC (permalink / raw)
To: Chun-Kuang Hu, Philipp Zabel
Cc: David Airlie, Simona Vetter, Matthias Brugger,
AngeloGioacchino Del Regno, shaoming chen, dri-devel,
linux-mediatek, linux-kernel, linux-arm-kernel, Zi-Hao Huang,
CK Hu
From: Zi-Hao Huang <zi-hao.huang@mediatek.com>
mtk_dsi_wait_for_irq_done() waits for the DSI IRQ with
wait_event_interruptible_timeout(). If it returns early, for example
with -ERESTARTSYS when a signal is pending, both callers still treat the
command as done, because they only handle a return value of 0 as a
failure.
On an MT8196 board this led to a hard lockup during shutdown. The wait
returned before the IRQ arrived, the panel disable sequence went on and
restarted video mode, and the late CMD_DONE interrupt was then handled
by mtk_dsi_irq(). The handler writes RACK and loops until DSI_BUSY
clears, but DSI_BUSY stays set while video mode is running, so the CPU
never leaves the handler until the watchdog fires. Forcing the wait to
return early reproduces the lockup every time, and it no longer
happens once the wait cannot return early.
The wait synchronises the driver with the hardware, and it is bounded by
its timeout. Use wait_event_timeout() so that it only ends on the IRQ or
the timeout.
wake_up_interruptible() cannot wake a task in uninterruptible sleep, so
switch mtk_dsi_irq() to wake_up(). Without it every wait would last
until its timeout.
Fixes: dd5080a54df8 ("drm/mediatek: add dsi interrupt control")
Signed-off-by: Zi-Hao Huang <zi-hao.huang@mediatek.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
---
Changes in v2:
- Drop the remark that the wait is not made on behalf of userspace, since
a userspace backlight change can reach it (CK)
- Collect Reviewed-by
- Link to v1: https://lore.kernel.org/r/20261118-mtk-dsi-irq-wait-v1-1-205f25fac8b2@mediatek.com
---
drivers/gpu/drm/mediatek/mtk_dsi.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index f82506e10fd5..1315dd31a834 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -627,9 +627,8 @@ static s32 mtk_dsi_wait_for_irq_done(struct mtk_dsi *dsi, u32 irq_flag,
unsigned long jiffies = msecs_to_jiffies(timeout);
struct drm_device *drm = dsi->bridge.dev;
- ret = wait_event_interruptible_timeout(dsi->irq_wait_queue,
- dsi->irq_data & irq_flag,
- jiffies);
+ ret = wait_event_timeout(dsi->irq_wait_queue,
+ dsi->irq_data & irq_flag, jiffies);
if (ret == 0) {
drm_warn(drm, "Wait DSI IRQ(0x%08x) Timeout\n", irq_flag);
@@ -656,7 +655,7 @@ static irqreturn_t mtk_dsi_irq(int irq, void *dev_id)
mtk_dsi_mask(dsi, DSI_INTSTA, status, 0);
mtk_dsi_irq_data_set(dsi, status);
- wake_up_interruptible(&dsi->irq_wait_queue);
+ wake_up(&dsi->irq_wait_queue);
}
return IRQ_HANDLED;
---
base-commit: 067c5c24cef23d913b67eaaf71ae67e7169a6620
change-id: 20261118-mtk-dsi-irq-wait-a24712ada627
Best regards,
--
Zi-Hao Huang <zi-hao.huang@mediatek.com>
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v2] drm/mediatek: dsi: Don't let a signal cut the IRQ wait short
2026-11-18 9:33 [PATCH v2] drm/mediatek: dsi: Don't let a signal cut the IRQ wait short Zi-Hao Huang via B4 Relay
@ 2026-11-18 12:32 ` AngeloGioacchino Del Regno
0 siblings, 0 replies; 2+ messages in thread
From: AngeloGioacchino Del Regno @ 2026-11-18 12:32 UTC (permalink / raw)
To: zi-hao.huang, Chun-Kuang Hu, Philipp Zabel
Cc: David Airlie, Simona Vetter, Matthias Brugger, shaoming chen,
dri-devel, linux-mediatek, linux-kernel, linux-arm-kernel, CK Hu
On 11/18/26 10:33, Zi-Hao Huang via B4 Relay wrote:
> From: Zi-Hao Huang <zi-hao.huang@mediatek.com>
>
> mtk_dsi_wait_for_irq_done() waits for the DSI IRQ with
> wait_event_interruptible_timeout(). If it returns early, for example
> with -ERESTARTSYS when a signal is pending, both callers still treat the
> command as done, because they only handle a return value of 0 as a
> failure.
>
> On an MT8196 board this led to a hard lockup during shutdown. The wait
> returned before the IRQ arrived, the panel disable sequence went on and
> restarted video mode, and the late CMD_DONE interrupt was then handled
> by mtk_dsi_irq().
This happens because of the hacks that you have downstream.
With the restructured mediatek-drm adding proper support for MT8196's Display
Controller architecture, what you're describing does not happen, because the
tear down path is correct.
Regards,
Angelo
> The handler writes RACK and loops until DSI_BUSY
> clears, but DSI_BUSY stays set while video mode is running, so the CPU
> never leaves the handler until the watchdog fires. Forcing the wait to
> return early reproduces the lockup every time, and it no longer
> happens once the wait cannot return early.
>
> The wait synchronises the driver with the hardware, and it is bounded by
> its timeout. Use wait_event_timeout() so that it only ends on the IRQ or
> the timeout.
>
> wake_up_interruptible() cannot wake a task in uninterruptible sleep, so
> switch mtk_dsi_irq() to wake_up(). Without it every wait would last
> until its timeout.
>
> Fixes: dd5080a54df8 ("drm/mediatek: add dsi interrupt control")
> Signed-off-by: Zi-Hao Huang <zi-hao.huang@mediatek.com>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
> ---
> Changes in v2:
> - Drop the remark that the wait is not made on behalf of userspace, since
> a userspace backlight change can reach it (CK)
> - Collect Reviewed-by
> - Link to v1: https://lore.kernel.org/r/20261118-mtk-dsi-irq-wait-v1-1-205f25fac8b2@mediatek.com
> ---
> drivers/gpu/drm/mediatek/mtk_dsi.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index f82506e10fd5..1315dd31a834 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -627,9 +627,8 @@ static s32 mtk_dsi_wait_for_irq_done(struct mtk_dsi *dsi, u32 irq_flag,
> unsigned long jiffies = msecs_to_jiffies(timeout);
> struct drm_device *drm = dsi->bridge.dev;
>
> - ret = wait_event_interruptible_timeout(dsi->irq_wait_queue,
> - dsi->irq_data & irq_flag,
> - jiffies);
> + ret = wait_event_timeout(dsi->irq_wait_queue,
> + dsi->irq_data & irq_flag, jiffies);
> if (ret == 0) {
> drm_warn(drm, "Wait DSI IRQ(0x%08x) Timeout\n", irq_flag);
>
> @@ -656,7 +655,7 @@ static irqreturn_t mtk_dsi_irq(int irq, void *dev_id)
>
> mtk_dsi_mask(dsi, DSI_INTSTA, status, 0);
> mtk_dsi_irq_data_set(dsi, status);
> - wake_up_interruptible(&dsi->irq_wait_queue);
> + wake_up(&dsi->irq_wait_queue);
> }
>
> return IRQ_HANDLED;
>
> ---
> base-commit: 067c5c24cef23d913b67eaaf71ae67e7169a6620
> change-id: 20261118-mtk-dsi-irq-wait-a24712ada627
>
> Best regards,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-18 12:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 9:33 [PATCH v2] drm/mediatek: dsi: Don't let a signal cut the IRQ wait short Zi-Hao Huang via B4 Relay
2026-11-18 12:32 ` AngeloGioacchino Del Regno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®