Hi, Moudy:
On Tue, 2022-03-01 at 18:02 +0800, Moudy Ho wrote:
> For the purpose of module independence, related settings should be
> moved
> from MDP to the corresponding driver.
> This patch adds more 8183 MDP settings and interface.
>
> Signed-off-by: Moudy Ho <moudy.ho@xxxxxxxxxxxx>
> Acked-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@xxxxxxxxxxxxx>
> ---
> drivers/soc/mediatek/mtk-mutex.c | 68
> ++++++++++++++++++++++++++
> include/linux/soc/mediatek/mtk-mutex.h | 3 ++
> 2 files changed, 71 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mtk-mutex.c
> b/drivers/soc/mediatek/mtk-mutex.c
> index aaf8fc1abb43..a6268ecde240 100644
> --- a/drivers/soc/mediatek/mtk-mutex.c
> +++ b/drivers/soc/mediatek/mtk-mutex.c
> @@ -136,6 +136,18 @@
> #define MT8183_MUTEX_EOF_DSI0 (MT8183_MUTEX_S
> OF_DSI0 << 6)
> #define MT8183_MUTEX_EOF_DPI0 (MT8183_MUTEX_S
> OF_DPI0 << 6)
>
> +#define MT8183_MUTEX_MDP_START 5
> +#define MT8183_MUTEX_MDP_MOD_MASK 0x07FFFFFF
> +#define MT8183_MUTEX_MDP_SOF_MASK 0x00000007
> +#define MT8183_MUTEX_MOD_MDP_RDMA0 BIT(2)
> +#define MT8183_MUTEX_MOD_MDP_RSZ0 BIT(4)
> +#define MT8183_MUTEX_MOD_MDP_RSZ1 BIT(5)
> +#define MT8183_MUTEX_MOD_MDP_TDSHP0 BIT(6)
> +#define MT8183_MUTEX_MOD_MDP_WROT0 BIT(7)
> +#define MT8183_MUTEX_MOD_MDP_WDMA BIT(8)
> +#define MT8183_MUTEX_MOD_MDP_AAL0 BIT(23)
> +#define MT8183_MUTEX_MOD_MDP_CCORR0 BIT(24)
> +
> struct mtk_mutex {
> int id;
> bool claimed;
> @@ -156,6 +168,10 @@ struct mtk_mutex_data {
> const unsigned int *mutex_sof;
> const unsigned int mutex_mod_reg;
> const unsigned int mutex_sof_reg;
> + const unsigned int *mutex_mdp_offset;
> + const unsigned int *mutex_mdp_mod;
> + const unsigned int mutex_mdp_mod_mask;
Useless, so remove this.
> + const unsigned int mutex_mdp_sof_mask;
Useless, so remove this.
> const bool no_clk;
> };
>
> @@ -243,6 +259,17 @@ static const unsigned int
> mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = {
> [DDP_COMPONENT_WDMA0] = MT8183_MUTEX_MOD_DISP_WDMA0,
> };
>
> +static const unsigned int mt8183_mutex_mdp_mod[MDP_MAX_COMP_COUNT] =
> {
> + [MDP_COMP_RDMA0] = MT8183_MUTEX_MOD_MDP_RDMA0,
> + [MDP_COMP_RSZ0] = MT8183_MUTEX_MOD_MDP_RSZ0,
> + [MDP_COMP_RSZ1] = MT8183_MUTEX_MOD_MDP_RSZ1,
> + [MDP_COMP_TDSHP0] = MT8183_MUTEX_MOD_MDP_TDSHP0,
> + [MDP_COMP_WROT0] = MT8183_MUTEX_MOD_MDP_WROT0,
> + [MDP_COMP_WDMA] = MT8183_MUTEX_MOD_MDP_WDMA,
> + [MDP_COMP_AAL0] = MT8183_MUTEX_MOD_MDP_AAL0,
> + [MDP_COMP_CCORR0] = MT8183_MUTEX_MOD_MDP_CCORR0,
> +};
> +
> static const unsigned int mt8186_mutex_mod[DDP_COMPONENT_ID_MAX] = {
> [DDP_COMPONENT_AAL0] = MT8186_MUTEX_MOD_DISP_AAL0,
> [DDP_COMPONENT_CCORR] = MT8186_MUTEX_MOD_DISP_CCORR0,
> @@ -300,6 +327,14 @@ static const unsigned int
> mt8186_mutex_sof[MUTEX_SOF_DSI3 + 1] = {
> [MUTEX_SOF_DPI0] = MT8186_MUTEX_SOF_DPI0 |
> MT8186_MUTEX_EOF_DPI0,
> };
>
> +/* 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
> +};
> +
> static const struct mtk_mutex_data mt2701_mutex_driver_data = {
> .mutex_mod = mt2701_mutex_mod,
> .mutex_sof = mt2712_mutex_sof,
> @@ -334,6 +369,10 @@ static const struct mtk_mutex_data
> mt8183_mutex_driver_data = {
> .mutex_sof = mt8183_mutex_sof,
> .mutex_mod_reg = MT8183_MUTEX0_MOD0,
> .mutex_sof_reg = MT8183_MUTEX0_SOF0,
> + .mutex_mdp_offset = mt8183_mutex_mdp_offset,
> + .mutex_mdp_mod = mt8183_mutex_mdp_mod,
> + .mutex_mdp_mod_mask = MT8183_MUTEX_MDP_MOD_MASK,
> + .mutex_mdp_sof_mask = MT8183_MUTEX_MDP_SOF_MASK,
> .no_clk = true,
> };
>
> @@ -366,6 +405,21 @@ struct mtk_mutex *mtk_mutex_get(struct device
> *dev)
> }
> EXPORT_SYMBOL_GPL(mtk_mutex_get);
>
> +struct mtk_mutex *mtk_mutex_mdp_get(struct device *dev,
> + enum mtk_mdp_pipe_id id)
For DRM, mutex id does not physically bound to specific hardware, why
do MDP need the pipeline id?
Regards,
CK
> +{
> + struct mtk_mutex_ctx *mtx = dev_get_drvdata(dev);
> + int i = mtx->data->mutex_mdp_offset[id];
> +
> + if (!mtx->mutex[i].claimed) {
> + mtx->mutex[i].claimed = true;
> + return &mtx->mutex[i];
> + }
> +
> + return ERR_PTR(-EBUSY);
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_mdp_get);
> +
> void mtk_mutex_put(struct mtk_mutex *mutex)
> {
> struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> @@ -485,6 +539,20 @@ void mtk_mutex_remove_comp(struct mtk_mutex
> *mutex,
> }
> EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp);
>
> +u32 mtk_mutex_get_mdp_mod(struct mtk_mutex *mutex, enum
> mtk_mdp_comp_id id)
> +{
> + struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> + mutex[mutex->id]);
> +
> + WARN_ON(&mtx->mutex[mutex->id] != mutex);
> +
> + if (mtx->data->mutex_mdp_mod)
> + return mtx->data->mutex_mdp_mod[id];
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_get_mdp_mod);
> +
> void mtk_mutex_enable(struct mtk_mutex *mutex)
> {
> struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> diff --git a/include/linux/soc/mediatek/mtk-mutex.h
> b/include/linux/soc/mediatek/mtk-mutex.h
> index 6fe4ffbde290..b2608f4220ee 100644
> --- a/include/linux/soc/mediatek/mtk-mutex.h
> +++ b/include/linux/soc/mediatek/mtk-mutex.h
> @@ -11,9 +11,12 @@ struct device;
> struct mtk_mutex;
>
> struct mtk_mutex *mtk_mutex_get(struct device *dev);
> +struct mtk_mutex *mtk_mutex_mdp_get(struct device *dev,
> + enum mtk_mdp_pipe_id id);
> int mtk_mutex_prepare(struct mtk_mutex *mutex);
> void mtk_mutex_add_comp(struct mtk_mutex *mutex,
> enum mtk_ddp_comp_id id);
> +u32 mtk_mutex_get_mdp_mod(struct mtk_mutex *mutex, enum
> mtk_mdp_comp_id id);
> void mtk_mutex_enable(struct mtk_mutex *mutex);
> void mtk_mutex_disable(struct mtk_mutex *mutex);
> void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
