lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 07/25] drm/mediatek: move rdma sout from mtk_ddp_mout_en into mtk_ddp_sout_sel
    Date
    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

    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 e4dafe0..5ae13b0 100644
    --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
    @@ -281,51 +281,6 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
    } 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 = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    - value = 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;
    }
    @@ -406,6 +361,51 @@ static unsigned int mtk_ddp_sout_sel(enum mtk_ddp_comp_id cur,
    } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI0) {
    *addr = DISP_REG_CONFIG_DSI_SEL;
    value = DSI_SEL_IN_RDMA;
    + } 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 = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
    + value = 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;
    }
    --
    1.8.1.1.dirty
    \
     
     \ /
      Last update: 2019-03-27 07:22    [W:4.075 / U:0.772 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site