lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v2 03/25] drm/mediatek: add mutex mod into ddp private data
    From
    Date
    Hi, Yongqiang:

    On Wed, 2019-03-27 at 14:18 +0800, yongqiang.niu@mediatek.com wrote:
    > From: Yongqiang Niu <yongqiang.niu@mediatek.com>
    >
    > mutex0 MOD register offset not always 0x2C.
    > for mt8183, that offset will be 0x30,
    > add this regsiter offset into private data
    >
    > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
    > ---
    > drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 53 +++++++++++++++++++++++++---------
    > 1 file changed, 39 insertions(+), 14 deletions(-)
    >
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > index 579ce28..7f0d46e 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > @@ -41,10 +41,12 @@
    > #define DISP_REG_CONFIG_DSI_SEL 0x050
    > #define DISP_REG_CONFIG_DPI_SEL 0x064
    >
    > +#define MT2701_DISP_MUTEX0_MOD0 0x2C

    Lower case, 0x2c.

    > +
    > #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(n) (0x2c + 0x20 * (n))
    > +#define DISP_REG_MUTEX_MOD(data, n) ((data)->mutex_mod_reg + 0x20 * (n))

    Why not just define as:

    #define DISP_REG_MUTEX_MOD(mutex_mod_reg, n) (mutex_mod_reg + 0x20 *
    (n))

    The mutex_mod_reg inside a structure or not is decided by the caller.

    > #define DISP_REG_MUTEX_SOF(n) (0x30 + 0x20 * (n))
    > #define DISP_REG_MUTEX_MOD2(n) (0x34 + 0x20 * (n))
    >
    > @@ -147,12 +149,17 @@ struct mtk_disp_mutex {
    > bool claimed;
    > };
    >
    > +struct mtk_ddp_data {
    > + const unsigned int *mutex_mod;
    > + unsigned int mutex_mod_reg;

    const

    Regards,
    cK

    > +};
    > +
    > struct mtk_ddp {
    > struct device *dev;
    > struct clk *clk;
    > void __iomem *regs;
    > struct mtk_disp_mutex mutex[10];
    > - const unsigned int *mutex_mod;
    > + const struct mtk_ddp_data *data;
    > };
    >
    > static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = {
    > @@ -202,6 +209,21 @@ struct mtk_ddp {
    > [DDP_COMPONENT_WDMA1] = MT8173_MUTEX_MOD_DISP_WDMA1,
    > };
    >
    > +static const struct mtk_ddp_data mt2701_ddp_driver_data = {
    > + .mutex_mod = mt2701_mutex_mod,
    > + .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > +};
    > +
    > +static const struct mtk_ddp_data mt2712_ddp_driver_data = {
    > + .mutex_mod = mt2712_mutex_mod,
    > + .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > +};
    > +
    > +static const struct mtk_ddp_data mt8173_ddp_driver_data = {
    > + .mutex_mod = mt8173_mutex_mod,
    > + .mutex_mod_reg = MT2701_DISP_MUTEX0_MOD0,
    > +};
    > +
    > static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
    > enum mtk_ddp_comp_id next,
    > unsigned int *addr)
    > @@ -464,15 +486,15 @@ void mtk_disp_mutex_add_comp(struct mtk_disp_mutex *mutex,
    > reg = MUTEX_SOF_DPI1;
    > break;
    > default:
    > - if (ddp->mutex_mod[id] < 32) {
    > - offset = DISP_REG_MUTEX_MOD(mutex->id);
    > + if (ddp->data->mutex_mod[id] < 32) {
    > + offset = DISP_REG_MUTEX_MOD(ddp->data, mutex->id);
    > reg = readl_relaxed(ddp->regs + offset);
    > - reg |= 1 << ddp->mutex_mod[id];
    > + reg |= 1 << ddp->data->mutex_mod[id];
    > writel_relaxed(reg, ddp->regs + offset);
    > } else {
    > offset = DISP_REG_MUTEX_MOD2(mutex->id);
    > reg = readl_relaxed(ddp->regs + offset);
    > - reg |= 1 << (ddp->mutex_mod[id] - 32);
    > + reg |= 1 << (ddp->data->mutex_mod[id] - 32);
    > writel_relaxed(reg, ddp->regs + offset);
    > }
    > return;
    > @@ -502,15 +524,15 @@ void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex,
    > ddp->regs + DISP_REG_MUTEX_SOF(mutex->id));
    > break;
    > default:
    > - if (ddp->mutex_mod[id] < 32) {
    > - offset = DISP_REG_MUTEX_MOD(mutex->id);
    > + if (ddp->data->mutex_mod[id] < 32) {
    > + offset = DISP_REG_MUTEX_MOD(ddp->data, mutex->id);
    > reg = readl_relaxed(ddp->regs + offset);
    > - reg &= ~(1 << ddp->mutex_mod[id]);
    > + reg &= ~(1 << ddp->data->mutex_mod[id]);
    > writel_relaxed(reg, ddp->regs + offset);
    > } else {
    > offset = DISP_REG_MUTEX_MOD2(mutex->id);
    > reg = readl_relaxed(ddp->regs + offset);
    > - reg &= ~(1 << (ddp->mutex_mod[id] - 32));
    > + reg &= ~(1 << (ddp->data->mutex_mod[id] - 32));
    > writel_relaxed(reg, ddp->regs + offset);
    > }
    > break;
    > @@ -585,7 +607,7 @@ static int mtk_ddp_probe(struct platform_device *pdev)
    > return PTR_ERR(ddp->regs);
    > }
    >
    > - ddp->mutex_mod = of_device_get_match_data(dev);
    > + ddp->data = of_device_get_match_data(dev);
    >
    > platform_set_drvdata(pdev, ddp);
    >
    > @@ -598,9 +620,12 @@ static int mtk_ddp_remove(struct platform_device *pdev)
    > }
    >
    > static const struct of_device_id ddp_driver_dt_match[] = {
    > - { .compatible = "mediatek,mt2701-disp-mutex", .data = mt2701_mutex_mod},
    > - { .compatible = "mediatek,mt2712-disp-mutex", .data = mt2712_mutex_mod},
    > - { .compatible = "mediatek,mt8173-disp-mutex", .data = mt8173_mutex_mod},
    > + { .compatible = "mediatek,mt2701-disp-mutex",
    > + .data = &mt2701_ddp_driver_data},
    > + { .compatible = "mediatek,mt2712-disp-mutex",
    > + .data = &mt2712_ddp_driver_data},
    > + { .compatible = "mediatek,mt8173-disp-mutex",
    > + .data = &mt8173_ddp_driver_data},
    > {},
    > };
    > MODULE_DEVICE_TABLE(of, ddp_driver_dt_match);


    \
     
     \ /
      Last update: 2019-03-28 02:34    [W:4.170 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site