[PATCH v4 09/19] soc: mediatek: mutex: refactor SOF settings for output components

[Paul Chen]

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

Refactor SOF settings by adding mtk_mutex_get_output_comp_sof()
and extracting SOF logic from mtk_mutex_add_comp()
and mtk_mutex_remove_comp().

Signed-off-by: Paul-pl Chen <paul-pl.c...@mediatek.com>
---
 drivers/soc/mediatek/mtk-mutex.c       | 57 +++++++++++++++++++++-----
 include/linux/soc/mediatek/mtk-mutex.h |  4 ++
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c
index 1e5df5aa0bd5..c48983d8a6cd 100644
--- a/drivers/soc/mediatek/mtk-mutex.c
+++ b/drivers/soc/mediatek/mtk-mutex.c
@@ -913,19 +913,57 @@ static int mtk_mutex_get_output_comp_sof(enum 
mtk_ddp_comp_id id)
        return -EINVAL;
 }
 
+void mtk_mutex_add_comp_sof(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]);
+       int sof_id = mtk_mutex_get_output_comp_sof(id);
+       unsigned int offset;
+
+       if (sof_id < 0 || sof_id >= DDP_MUTEX_SOF_MAX)
+               return;
+
+       WARN_ON(&mtx->mutex[mutex->id] != mutex);
+
+       offset = DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id);
+
+       writel_relaxed(mtx->data->mutex_sof[sof_id], mtx->regs + offset);
+}
+EXPORT_SYMBOL_GPL(mtk_mutex_add_comp_sof);
+
+void mtk_mutex_remove_comp_sof(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;
+       int sof_id = mtk_mutex_get_output_comp_sof(id);
+       unsigned int offset;
+
+       if (sof_id < 0 || sof_id >= DDP_MUTEX_SOF_MAX)
+               return;
+
+       WARN_ON(&mtx->mutex[mutex->id] != mutex);
+
+       offset = DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id);
+       reg = readl_relaxed(mtx->regs + offset);
+       reg &= ~(1 << mtx->data->mutex_sof[id]);
+
+       writel_relaxed(reg, mtx->regs + offset);
+}
+EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp_sof);
+
 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, mod_id;
        unsigned int offset;
-       int sof_id = mtk_mutex_get_output_comp_sof(id);
+       bool is_output_comp = (mtk_mutex_get_output_comp_sof(id) > 0);
 
        WARN_ON(&mtx->mutex[mutex->id] != mutex);
 
-       if (sof_id < 0) {
+       if (!is_output_comp) {
                if (mtx->data->mutex_mod[id] < 32) {
                        offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
                                                    mutex->id);
@@ -941,8 +979,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex,
                return;
        }
 
-       writel_relaxed(mtx->data->mutex_sof[sof_id], mtx->regs +
-                      DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id));
+       mtk_mutex_add_comp_sof(mutex, id);
 }
 EXPORT_SYMBOL_GPL(mtk_mutex_add_comp);
 
@@ -954,10 +991,11 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
        unsigned int reg;
        unsigned int mod_id;
        unsigned int offset;
-       int sof_id = mtk_mutex_get_output_comp_sof(id);
+       bool is_output_comp = (mtk_mutex_get_output_comp_sof(id) > 0);
+
        WARN_ON(&mtx->mutex[mutex->id] != mutex);
 
-       if (sof_id < 0) {
+       if (!is_output_comp) {
                if (mtx->data->mutex_mod[id] < 32) {
                        offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
                                                    mutex->id);
@@ -973,9 +1011,8 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
                return;
        }
 
-       writel_relaxed(MUTEX_SOF_SINGLE_MODE,
-                      mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg,
-                      mutex->id));
+       mtk_mutex_remove_comp_sof(mutex, id);
+
 }
 EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp);
 
diff --git a/include/linux/soc/mediatek/mtk-mutex.h 
b/include/linux/soc/mediatek/mtk-mutex.h
index 635218e3ac68..515e2d8bfc90 100644
--- a/include/linux/soc/mediatek/mtk-mutex.h
+++ b/include/linux/soc/mediatek/mtk-mutex.h
@@ -69,6 +69,10 @@ enum mtk_mutex_sof_index {
 
 struct mtk_mutex *mtk_mutex_get(struct device *dev);
 int mtk_mutex_prepare(struct mtk_mutex *mutex);
+void mtk_mutex_add_comp_sof(struct mtk_mutex *mutex,
+                           enum mtk_ddp_comp_id id);
+void mtk_mutex_remove_comp_sof(struct mtk_mutex *mutex,
+                              enum mtk_ddp_comp_id id);
 void mtk_mutex_add_comp(struct mtk_mutex *mutex,
                        enum mtk_ddp_comp_id id);
 void mtk_mutex_enable(struct mtk_mutex *mutex);
-- 
2.45.2