drm/msm/dpu: enumerate second cursor pipe for external interface
PATCH 1/1 drm/msm/dpu: enumerate second cursor pipe for external interface
Setup an RGB HW pipe as cursor which can be used on secondary interface.
For SC7180 2 HW pipes are enumerated as cursors
1 - primary interface
2 - secondary interface
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +6 -6
@@ -117,10 +117,10 @@ .reg_off = 0x2AC, .bit_off = 0}, .clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2AC, .bit_off = 8}, - .clk_ctrls[DPU_CLK_CTRL_DMA1] = { - .reg_off = 0x2B4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { - .reg_off = 0x2BC, .bit_off = 8}, + .reg_off = 0x2B4, .bit_off = 8}, + .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { + .reg_off = 0x2C4, .bit_off = 8}, }, };
@@ -272,10 +272,10 @@ sc7180_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),SSPP_BLK ("sspp_8" ,SSPP_DMA0 ,0x24000 ,DMA_SDM845_MASK , sdm845_dma_sblk_0,1 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA0 ), -SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_SDM845_MASK , - sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA1 ), +SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_CURSOR_SDM845_MASK , + sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_CURSOR0 ),SSPP_BLK ("sspp_10" ,SSPP_DMA2 ,0x28000 ,DMA_CURSOR_SDM845_MASK , - sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR0), + sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR1), };/*************************************************************
Signature · 1 line
1.9.1
Quoted 18 lines · Kalyan Thota
Setup an RGB HW pipe as cursor which can be used on secondary interface.
For SC7180 2 HW pipes are enumerated as cursors
1 - primary interface
2 - secondary interfaceSigned-off-by Kalyan Thota <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0
-0
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c line 123
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +3
-3@@ -117,10 +117,10 @@ .reg_off = 0x2AC, .bit_off = 0}, .clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2AC, .bit_off = 8}, - .clk_ctrls[DPU_CLK_CTRL_DMA1] = { - .reg_off = 0x2B4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { - .reg_off = 0x2BC, .bit_off = 8}, + .reg_off = 0x2B4, .bit_off = 8}, + .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { + .reg_off = 0x2C4, .bit_off = 8},
It looks like you shifted the register offset here from 0x2bc to 0x2c4, was that intentional?
BR,
-R
Quoted 18 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +3
-4}, };@@ -272,10 +272,10 @@ sc7180_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),SSPP_BLK ("sspp_8" ,SSPP_DMA0 ,0x24000 ,DMA_SDM845_MASK , sdm845_dma_sblk_0,1 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA0 ), -SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_SDM845_MASK , - sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA1 ), +SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_CURSOR_SDM845_MASK , + sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_CURSOR0 ),SSPP_BLK ("sspp_10" ,SSPP_DMA2 ,0x28000 ,DMA_CURSOR_SDM845_MASK , - sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR0), + sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR1), };/************************************************************* --
Quoted 2 lines
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 33 lines · Rob Clark
Quoted 18 lines · Kalyan Thota
Setup an RGB HW pipe as cursor which can be used on secondary interface.
For SC7180 2 HW pipes are enumerated as cursors
1 - primary interface
2 - secondary interfaceSigned-off-by Kalyan Thota <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0
-0drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c line 123
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +3
-3@@ -117,10 +117,10 @@ .reg_off = 0x2AC, .bit_off = 0}, .clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2AC, .bit_off = 8}, - .clk_ctrls[DPU_CLK_CTRL_DMA1] = { - .reg_off = 0x2B4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { - .reg_off = 0x2BC, .bit_off = 8}, + .reg_off = 0x2B4, .bit_off = 8}, + .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { + .reg_off = 0x2C4, .bit_off = 8},It looks like you shifted the register offset here from
0x2bcto0x2c4, was that intentional?
Quoted 2 lines
BR,
-R
Yes Rob, the offset was wrong which i corrected in this patch.
Quoted 33 lines
Quoted 25 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +2
-2}, };@@ -272,10 +272,10 @@ sc7180_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0), SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, DMA_SDM845_MASK, sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0), -SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_SDM845_MASK , - sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA , DPU_CLK_CTRL_DMA1), +SSPP_BLK ("sspp_9" ,SSPP_DMA1 ,0x26000 ,DMA_CURSOR_SDM845_MASK , + sdm845_dma_sblk_1,5 ,SSPP_TYPE_DMA , DPU_CLK_CTRL_CURSOR0),SSPP_BLK("sspp_10", SSPP_DMA2, 0x28000,
DMA_CURSOR_SDM845_MASK,
-sdm845_dma_sblk_2, 9,SSPP_TYPE_DMA,DPU_CLK_CTRL_CURSOR0),
+sdm845_dma_sblk_2, 9,SSPP_TYPE_DMA,DPU_CLK_CTRL_CURSOR1),
};Quoted 4 lines
/*************************************************************
--
1.9.1_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoted 37 lines · On Mon, Jul 13, 2020 at 3:18 AM <[email protected]> wrote:
Quoted 35 lines · Rob Clark
Quoted 19 lines · Kalyan Thota
Setup an RGB HW pipe as cursor which can be used on secondary interface.
For SC7180 2 HW pipes are enumerated as cursors
1 - primary interface
2 - secondary interfaceSigned-off-by Kalyan Thota <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0
-0drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c line 123
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +3
-3@@ -117,10 +117,10 @@ .reg_off = 0x2AC, .bit_off = 0}, .clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2AC, .bit_off = 8}, - .clk_ctrls[DPU_CLK_CTRL_DMA1] = { - .reg_off = 0x2B4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { - .reg_off = 0x2BC, .bit_off = 8}, + .reg_off = 0x2B4, .bit_off = 8}, + .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { + .reg_off = 0x2C4, .bit_off = 8},It looks like you shifted the register offset here from
0x2bcto0x2c4, was that intentional?
Quoted 3 lines
Quoted 2 lines
BR,
-RYes Rob, the offset was wrong which i corrected in this patch.
Thanks for confirming. In the future, it would have been useful to mention that in the commit msg.
BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel