lkml.org 
[lkml]   [2019]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v5, 13/32] drm/mediatek: move rdma sout from mtk_ddp_mout_en into mtk_ddp_sout_sel
    From
    Date
    Hi, Yongqiang:

    On Thu, 2019-08-29 at 22:50 +0800, yongqiang.niu@mediatek.com wrote:
    > From: Yongqiang Niu <yongqiang.niu@mediatek.com>
    >
    > This patch move rdma sout from mtk_ddp_mout_en into mtk_ddp_sout_sel
    > rdma only has single output, but no multi output,
    > all these rdma->dsi/dpi usecase should move to mtk_ddp_sout_sel

    Reviewed-by: CK Hu <ck.hu@mediatek.com>

    >
    > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
    > ---
    > drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 90 +++++++++++++++++-----------------
    > 1 file changed, 45 insertions(+), 45 deletions(-)
    >
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > index 338cc2f..a5a6689 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    > @@ -299,51 +299,6 @@ static unsigned int mtk_ddp_mout_en(const struct mtk_mmsys_reg_data *data,
    > } else if (cur == DDP_COMPONENT_OD1 && next == DDP_COMPONENT_RDMA1) {
    > *addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN;
    > value = OD1_MOUT_EN_RDMA1;
    > - } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI0) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > - value = RDMA0_SOUT_DPI0;
    > - } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > - value = RDMA0_SOUT_DPI1;
    > - } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > - value = RDMA0_SOUT_DSI1;
    > - } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI2) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > - value = RDMA0_SOUT_DSI2;
    > - } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI3) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > - value = RDMA0_SOUT_DSI3;
    > - } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > - value = RDMA1_SOUT_DSI1;
    > - } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI2) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > - value = RDMA1_SOUT_DSI2;
    > - } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI3) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > - value = RDMA1_SOUT_DSI3;
    > - } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI0) {
    > - *addr = data->rdma1_sout_sel_in;
    > - value = data->rdma1_sout_dpi0;
    > - } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > - value = RDMA1_SOUT_DPI1;
    > - } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > - value = RDMA2_SOUT_DPI0;
    > - } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > - value = RDMA2_SOUT_DPI1;
    > - } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > - value = RDMA2_SOUT_DSI1;
    > - } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI2) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > - value = RDMA2_SOUT_DSI2;
    > - } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI3) {
    > - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > - value = RDMA2_SOUT_DSI3;
    > } else {
    > value = 0;
    > }
    > @@ -423,6 +378,51 @@ static unsigned int mtk_ddp_sout_sel(const struct mtk_mmsys_reg_data *data,
    > } else if (cur == DDP_COMPONENT_BLS && next == DDP_COMPONENT_DPI0) {
    > *addr = DISP_REG_CONFIG_OUT_SEL;
    > value = BLS_TO_DPI_RDMA1_TO_DSI;
    > + } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI0) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > + value = RDMA0_SOUT_DPI0;
    > + } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > + value = RDMA0_SOUT_DPI1;
    > + } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > + value = RDMA0_SOUT_DSI1;
    > + } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI2) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > + value = RDMA0_SOUT_DSI2;
    > + } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI3) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
    > + value = RDMA0_SOUT_DSI3;
    > + } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > + value = RDMA1_SOUT_DSI1;
    > + } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI2) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > + value = RDMA1_SOUT_DSI2;
    > + } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI3) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > + value = RDMA1_SOUT_DSI3;
    > + } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI0) {
    > + *addr = data->rdma1_sout_sel_in;
    > + value = data->rdma1_sout_dpi0;
    > + } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    > + value = RDMA1_SOUT_DPI1;
    > + } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > + value = RDMA2_SOUT_DPI0;
    > + } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > + value = RDMA2_SOUT_DPI1;
    > + } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > + value = RDMA2_SOUT_DSI1;
    > + } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI2) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > + value = RDMA2_SOUT_DSI2;
    > + } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI3) {
    > + *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
    > + value = RDMA2_SOUT_DSI3;
    > } else {
    > value = 0;
    > }


    \
     
     \ /
      Last update: 2019-08-30 07:42    [W:4.079 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site