[PATCH v3 07/17] soc: mediatek: mutex: Reused the switch case for SOF ID

paul-pl.chen
2025-05-15T11:19:23Z

From: Paul-pl Chen <paul-pl.chen@mediatek.com>

Reused the switch case for SOF IDs.

Signed-off-by: Nancy Lin <nancy.lin@mediatek.com>
Signed-off-by: Paul-pl Chen <paul-pl.chen@mediatek.com>
---
drivers/soc/mediatek/mtk-mutex.c | 81 ++++++++++++++------------------
1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c
index aaa965d4b050..47f4d9ae4bfc 100644
--- a/drivers/soc/mediatek/mtk-mutex.c
+++ b/drivers/soc/mediatek/mtk-mutex.c
@@ -853,43 +853,45 @@ void mtk_mutex_unprepare(struct mtk_mutex *mutex)
}
EXPORT_SYMBOL_GPL(mtk_mutex_unprepare);

-void mtk_mutex_add_comp(struct mtk_mutex *mutex,
- enum mtk_ddp_comp_id id)
+static int mtk_mutex_get_output_comp_sof(enum mtk_ddp_comp_id id)
{
- struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx,
- mutex[mutex->id]);
- unsigned int reg;
- unsigned int sof_id;
- unsigned int offset;
-
- WARN_ON(&mtx->mutex[mutex->id] != mutex);
-
switch (id) {
case DDP_COMPONENT_DSI0:
- sof_id = MUTEX_SOF_DSI0;
- break;
+ return MUTEX_SOF_DSI0;
case DDP_COMPONENT_DSI1:
- sof_id = MUTEX_SOF_DSI0;
- break;
+ return MUTEX_SOF_DSI1;
case DDP_COMPONENT_DSI2:
- sof_id = MUTEX_SOF_DSI2;
- break;
+ return MUTEX_SOF_DSI2;
case DDP_COMPONENT_DSI3:
- sof_id = MUTEX_SOF_DSI3;
- break;
+ return MUTEX_SOF_DSI3;
case DDP_COMPONENT_DPI0:
- sof_id = MUTEX_SOF_DPI0;
- break;
+ return MUTEX_SOF_DPI0;
case DDP_COMPONENT_DPI1:
- sof_id = MUTEX_SOF_DPI1;
- break;
+ return MUTEX_SOF_DPI1;
case DDP_COMPONENT_DP_INTF0:
- sof_id = MUTEX_SOF_DP_INTF0;
- break;
+ return MUTEX_SOF_DP_INTF0;
case DDP_COMPONENT_DP_INTF1:
- sof_id = MUTEX_SOF_DP_INTF1;
- break;
+ return MUTEX_SOF_DP_INTF1;
default:
+ break;
+ }
+
+ return -EINVAL;
+}
+
+void mtk_mutex_add_comp(struct mtk_mutex *mutex,
+ enum mtk_ddp_comp_id id)
+{
+ struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx,
+ mutex[mutex->id]);
+ unsigned int reg;
+ unsigned int sof_id;
+ unsigned int offset;
+ int sof_id = mtk_mutex_get_output_comp_sof(id);
+
+ WARN_ON(&mtx->mutex[mutex->id] != mutex);
+
+ if (sof_id < 0) {
if (mtx->data->mutex_mod[id] < 32) {
offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
mutex->id);
@@ -905,8 +907,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex,
return;
}

- writel_relaxed(mtx->data->mutex_sof[sof_id],
- mtx->regs +
+ writel_relaxed(mtx->data->mutex_sof[sof_id], mtx->regs +
DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id));
}
EXPORT_SYMBOL_GPL(mtk_mutex_add_comp);
@@ -918,24 +919,10 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
mutex[mutex->id]);
unsigned int reg;
unsigned int offset;
-
+ int sof_id = mtk_mutex_get_output_comp_sof(id);
WARN_ON(&mtx->mutex[mutex->id] != mutex);

- switch (id) {
- case DDP_COMPONENT_DSI0:
- case DDP_COMPONENT_DSI1:
- case DDP_COMPONENT_DSI2:
- case DDP_COMPONENT_DSI3:
- case DDP_COMPONENT_DPI0:
- case DDP_COMPONENT_DPI1:
- case DDP_COMPONENT_DP_INTF0:
- case DDP_COMPONENT_DP_INTF1:
- writel_relaxed(MUTEX_SOF_SINGLE_MODE,
- mtx->regs +
- DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg,
- mutex->id));
- break;
- default:
+ if (sof_id < 0) {
if (mtx->data->mutex_mod[id] < 32) {
offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
mutex->id);
@@ -948,8 +935,12 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
reg &= ~(1 << (mtx->data->mutex_mod[id] - 32));
writel_relaxed(reg, mtx->regs + offset);
}
- break;
+ return;
}
+
+ writel_relaxed(MUTEX_SOF_SINGLE_MODE,
+ mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg,
+ mutex->id));
}
EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp);

--
2.45.2