From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: "roy-cw.yeh" <roy-cw.yeh@mediatek.com>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Fabien Parent <fparent@baylibre.com>,
"jason-jh . lin" <jason-jh.lin@mediatek.com>,
daoyuan huang <daoyuan.huang@mediatek.com>,
Ping-Hsun Wu <ping-hsun.wu@mediatek.com>,
Moudy Ho <moudy.ho@mediatek.com>,
"river . cheng" <river.cheng@mediatek.com>,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH v2 2/9] soc: mediatek: mutex: expand parameter for mdp mutex function
Date: Wed, 20 Oct 2021 11:29:48 +0200 [thread overview]
Message-ID: <0eaea2d4-1683-622a-e814-8b6c7c3eab2e@collabora.com> (raw)
In-Reply-To: <20211020071448.14187-3-roy-cw.yeh@mediatek.com>
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);
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-10-20 9:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 7:14 [PATCH v2 0/9] Add mdp support for mt8195 roy-cw.yeh
2021-10-20 7:14 ` [PATCH v2 1/9] soc: mediatek: mmsys: expand MDP enum for chip independence architecture roy-cw.yeh
2021-10-20 9:30 ` AngeloGioacchino Del Regno
2021-10-20 7:14 ` [PATCH v2 2/9] soc: mediatek: mutex: expand parameter for mdp mutex function roy-cw.yeh
2021-10-20 9:29 ` AngeloGioacchino Del Regno [this message]
2021-10-20 7:14 ` [PATCH v2 3/9] media: platform: mtk-mdp3: add chip independence architecture roy-cw.yeh
2021-10-20 9:29 ` AngeloGioacchino Del Regno
2021-10-20 7:14 ` [PATCH v2 4/9] dt-bindings: media: mediatek: mdp3: add additional function block yaml roy-cw.yeh
2021-10-20 7:14 ` [PATCH v2 5/9] arm64: dts: mt8195: add mdp3 node roy-cw.yeh
2021-10-20 7:14 ` [PATCH v2 6/9] soc: mediatek: mmsys: support mt8195 vppsys0/1 roy-cw.yeh
2021-10-20 7:14 ` [PATCH v2 7/9] soc: mediatek: mutex: " roy-cw.yeh
2021-10-20 7:14 ` [PATCH v2 9/9] media: platform: mtk-mdp3: Add dual pipe feature support roy-cw.yeh
2021-10-20 9:28 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0eaea2d4-1683-622a-e814-8b6c7c3eab2e@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=daoyuan.huang@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=fparent@baylibre.com \
--cc=jason-jh.lin@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=moudy.ho@mediatek.com \
--cc=ping-hsun.wu@mediatek.com \
--cc=river.cheng@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=roy-cw.yeh@mediatek.com \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).