lkml.org 
[lkml]   [2021]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2 2/9] soc: mediatek: mutex: expand parameter for mdp mutex function
From
Date
Il 20/10/21 09:14, roy-cw.yeh ha scritto:
> From: "Roy-CW.Yeh" <roy-cw.yeh@mediatek.com>
>
> Expand parameter for mdp mutex function
>
> Signed-off-by: Roy-CW.Yeh <roy-cw.yeh@mediatek.com>

Acked-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>


> ---
> drivers/soc/mediatek/mtk-mutex.c | 26 ++++++++++++++++++--------
> include/linux/soc/mediatek/mtk-mutex.h | 2 +-
> 2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c
> index 814f58f692cf..c100a5249016 100644
> --- a/drivers/soc/mediatek/mtk-mutex.c
> +++ b/drivers/soc/mediatek/mtk-mutex.c
> @@ -25,8 +25,9 @@
> #define DISP_REG_MUTEX_EN(n) (0x20 + 0x20 * (n))
> #define DISP_REG_MUTEX(n) (0x24 + 0x20 * (n))
> #define DISP_REG_MUTEX_RST(n) (0x28 + 0x20 * (n))
> -#define DISP_REG_MUTEX_MOD(mutex_mod_reg, n) (mutex_mod_reg + 0x20 * (n))
> -#define DISP_REG_MUTEX_SOF(mutex_sof_reg, n) (mutex_sof_reg + 0x20 * (n))
> +#define DISP_REG_MUTEX_MOD(mutex_mod_reg, n) ((mutex_mod_reg) + 0x20 * (n))
> +#define DISP_REG_MUTEX_MOD1(mutex_mod_reg, n) ((mutex_mod_reg) + 0x20 * (n) + 0x4)
> +#define DISP_REG_MUTEX_SOF(mutex_sof_reg, n) ((mutex_sof_reg) + 0x20 * (n))
> #define DISP_REG_MUTEX_MOD2(n) (0x34 + 0x20 * (n))
>
> #define INT_MUTEX BIT(1)
> @@ -116,6 +117,11 @@
> #define MT8183_MUTEX_MDP_MOD_MASK 0x07FFFFFF
> #define MT8183_MUTEX_MDP_SOF_MASK 0x00000007
>
> +#define MT8183_MDP_PIPE_IMGI MT8183_MUTEX_MDP_START
> +#define MT8183_MDP_PIPE_RDMA0 (MT8183_MUTEX_MDP_START + 1)
> +#define MT8183_MDP_PIPE_WPEI (MT8183_MUTEX_MDP_START + 2)
> +#define MT8183_MDP_PIPE_WPEI2 (MT8183_MUTEX_MDP_START + 3)
> +
> struct mtk_mutex {
> int id;
> bool claimed;
> @@ -254,10 +260,10 @@ static const unsigned int mt8183_mutex_sof[MUTEX_SOF_DSI3 + 1] = {
>
> /* indicate which mutex is used by each pipepline */
> static const unsigned int mt8183_mutex_mdp_offset[MDP_PIPE_MAX] = {
> - [MDP_PIPE_IMGI] = MT8183_MUTEX_MDP_START,
> - [MDP_PIPE_RDMA0] = MT8183_MUTEX_MDP_START + 1,
> - [MDP_PIPE_WPEI] = MT8183_MUTEX_MDP_START + 2,
> - [MDP_PIPE_WPEI2] = MT8183_MUTEX_MDP_START + 3
> + [MDP_PIPE_IMGI] = MT8183_MDP_PIPE_IMGI,
> + [MDP_PIPE_RDMA0] = MT8183_MDP_PIPE_RDMA0,
> + [MDP_PIPE_WPEI] = MT8183_MDP_PIPE_WPEI,
> + [MDP_PIPE_WPEI2] = MT8183_MDP_PIPE_WPEI2,
> };
>
> static const struct mtk_mutex_data mt2701_mutex_driver_data = {
> @@ -410,7 +416,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex,
> EXPORT_SYMBOL_GPL(mtk_mutex_add_comp);
>
> void mtk_mutex_add_mdp_mod(struct mtk_mutex *mutex, u32 mod,
> - struct mmsys_cmdq_cmd *cmd)
> + u32 mod1, u32 sof, struct mmsys_cmdq_cmd *cmd)
> {
> struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx,
> mutex[mutex->id]);
> @@ -422,9 +428,13 @@ void mtk_mutex_add_mdp_mod(struct mtk_mutex *mutex, u32 mod,
> cmdq_pkt_write_mask(cmd->pkt, mtx->subsys_id, mtx->addr + offset,
> mod, mtx->data->mutex_mdp_mod_mask);
>
> + offset = DISP_REG_MUTEX_MOD1(mtx->data->mutex_mod_reg, mutex->id);
> + cmdq_pkt_write_mask(cmd->pkt, mtx->subsys_id, mtx->addr + offset,
> + mod1, mtx->data->mutex_mdp_mod_mask);
> +
> offset = DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id);
> cmdq_pkt_write_mask(cmd->pkt, mtx->subsys_id, mtx->addr + offset,
> - 0, mtx->data->mutex_mdp_sof_mask);
> + sof, mtx->data->mutex_mdp_sof_mask);
> }
> EXPORT_SYMBOL_GPL(mtk_mutex_add_mdp_mod);
>
> diff --git a/include/linux/soc/mediatek/mtk-mutex.h b/include/linux/soc/mediatek/mtk-mutex.h
> index d08b98419dd9..a2b81ce55b5d 100644
> --- a/include/linux/soc/mediatek/mtk-mutex.h
> +++ b/include/linux/soc/mediatek/mtk-mutex.h
> @@ -17,7 +17,7 @@ int mtk_mutex_prepare(struct mtk_mutex *mutex);
> void mtk_mutex_add_comp(struct mtk_mutex *mutex,
> enum mtk_ddp_comp_id id);
> void mtk_mutex_add_mdp_mod(struct mtk_mutex *mutex, u32 mod,
> - struct mmsys_cmdq_cmd *cmd);
> + u32 mod1, u32 sof, struct mmsys_cmdq_cmd *cmd);
> void mtk_mutex_enable(struct mtk_mutex *mutex);
> void mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex,
> struct mmsys_cmdq_cmd *cmd);
>


\
 
 \ /
  Last update: 2021-10-20 11:31    [W:0.049 / U:3.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site