lkml.org 
[lkml]   [2019]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v3, 08/27] drm/mediatek: add mutex sof into ddp private data
    From
    Date
    Hi, Yongqiang:

    On Wed, 2019-06-05 at 19:42 +0800, yongqiang.niu@mediatek.com wrote:
    > From: Yongqiang Niu <yongqiang.niu@mediatek.com>
    >
    > mutex sof will be ddp private data
    >
    > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
    > ---
    > drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 44 +++++++++++++++++++++++++++-------
    > 1 file changed, 36 insertions(+), 8 deletions(-)
    >
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > index 8bde2cf..e1a510f 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > @@ -149,8 +149,20 @@ struct mtk_disp_mutex {
    > bool claimed;
    > };
    >
    > +enum mtk_ddp_mutex_sof_id {
    > + DDP_MUTEX_SOF_SINGLE_MODE,
    > + DDP_MUTEX_SOF_DSI0,
    > + DDP_MUTEX_SOF_DSI1,
    > + DDP_MUTEX_SOF_DPI0,
    > + DDP_MUTEX_SOF_DPI1,
    > + DDP_MUTEX_SOF_DSI2,
    > + DDP_MUTEX_SOF_DSI3,
    > + DDP_MUTEX_SOF_MAX,

    DDP_MUTEX_SOF_MAX can be removed.

    Regards,
    CK

    > +};
    > +
    > struct mtk_ddp_data {
    > const unsigned int *mutex_mod;
    > + const unsigned int *mutex_sof;
    > const unsigned int mutex_mod_reg;
    > };
    >
    > @@ -209,18 +221,31 @@ struct mtk_ddp {
    > [DDP_COMPONENT_WDMA1] = MT8173_MUTEX_MOD_DISP_WDMA1,
    > };
    >
    > +static const unsigned int mt2712_mutex_sof[DDP_MUTEX_SOF_MAX] = {
    > + [DDP_MUTEX_SOF_SINGLE_MODE] = MUTEX_SOF_SINGLE_MODE,
    > + [DDP_MUTEX_SOF_DSI0] = MUTEX_SOF_DSI0,
    > + [DDP_MUTEX_SOF_DSI1] = MUTEX_SOF_DSI1,
    > + [DDP_MUTEX_SOF_DPI0] = MUTEX_SOF_DPI0,
    > + [DDP_MUTEX_SOF_DPI1] = MUTEX_SOF_DPI1,
    > + [DDP_MUTEX_SOF_DSI2] = MUTEX_SOF_DSI2,
    > + [DDP_MUTEX_SOF_DSI3] = MUTEX_SOF_DSI3,
    > +};
    > +
    > static const struct mtk_ddp_data mt2701_ddp_driver_data = {
    > .mutex_mod = mt2701_mutex_mod,
    > + .mutex_sof = mt2712_mutex_sof,
    > .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > };
    >
    > static const struct mtk_ddp_data mt2712_ddp_driver_data = {
    > .mutex_mod = mt2712_mutex_mod,
    > + .mutex_sof = mt2712_mutex_sof,
    > .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > };
    >
    > static const struct mtk_ddp_data mt8173_ddp_driver_data = {
    > .mutex_mod = mt8173_mutex_mod,
    > + .mutex_sof = mt2712_mutex_sof,
    > .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > };
    >
    > @@ -462,28 +487,29 @@ void mtk_disp_mutex_add_comp(struct mtk_disp_mutex *mutex,
    > struct mtk_ddp *ddp = container_of(mutex, struct mtk_ddp,
    > mutex[mutex->id]);
    > unsigned int reg;
    > + unsigned int sof_id;
    > unsigned int offset;
    >
    > WARN_ON(&ddp->mutex[mutex->id] != mutex);
    >
    > switch (id) {
    > case DDP_COMPONENT_DSI0:
    > - reg = MUTEX_SOF_DSI0;
    > + sof_id = DDP_MUTEX_SOF_DSI0;
    > break;
    > case DDP_COMPONENT_DSI1:
    > - reg = MUTEX_SOF_DSI0;
    > + sof_id = DDP_MUTEX_SOF_DSI0;
    > break;
    > case DDP_COMPONENT_DSI2:
    > - reg = MUTEX_SOF_DSI2;
    > + sof_id = DDP_MUTEX_SOF_DSI2;
    > break;
    > case DDP_COMPONENT_DSI3:
    > - reg = MUTEX_SOF_DSI3;
    > + sof_id = DDP_MUTEX_SOF_DSI3;
    > break;
    > case DDP_COMPONENT_DPI0:
    > - reg = MUTEX_SOF_DPI0;
    > + sof_id = DDP_MUTEX_SOF_DPI0;
    > break;
    > case DDP_COMPONENT_DPI1:
    > - reg = MUTEX_SOF_DPI1;
    > + sof_id = DDP_MUTEX_SOF_DPI1;
    > break;
    > default:
    > if (ddp->data->mutex_mod[id] < 32) {
    > @@ -501,7 +527,8 @@ void mtk_disp_mutex_add_comp(struct mtk_disp_mutex *mutex,
    > return;
    > }
    >
    > - writel_relaxed(reg, ddp->regs + DISP_REG_MUTEX_SOF(mutex->id));
    > + writel_relaxed(ddp->data->mutex_sof[sof_id],
    > + ddp->regs + DISP_REG_MUTEX_SOF(mutex->id));
    > }
    >
    > void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex,
    > @@ -522,7 +549,8 @@ void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex,
    > case DDP_COMPONENT_DPI0:
    > case DDP_COMPONENT_DPI1:
    > writel_relaxed(MUTEX_SOF_SINGLE_MODE,
    > - ddp->regs + DISP_REG_MUTEX_SOF(mutex->id));
    > + ddp->regs +
    > + DISP_REG_MUTEX_SOF(mutex->id));
    > break;
    > default:
    > if (ddp->data->mutex_mod[id] < 32) {


    \
     
     \ /
      Last update: 2019-06-06 08:13    [W:7.249 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site