* [v1] drm/msm/dpu: enumerate second cursor pipe for external interface
@ 2020-06-25 12:45 Kalyan Thota
2020-07-10 16:49 ` Rob Clark
0 siblings, 1 reply; 4+ messages in thread
From: Kalyan Thota @ 2020-06-25 12:45 UTC (permalink / raw)
To: dri-devel, linux-arm-msm, freedreno, devicetree
Cc: Kalyan Thota, linux-kernel, robdclark, seanpaul, hoegsberg,
dianders, mkrishn, travitej, nganji, swboyd
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
Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
index 8f2357d..23061fd 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -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),
};
/*************************************************************
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [v1] drm/msm/dpu: enumerate second cursor pipe for external interface
2020-06-25 12:45 [v1] drm/msm/dpu: enumerate second cursor pipe for external interface Kalyan Thota
@ 2020-07-10 16:49 ` Rob Clark
2020-07-13 10:18 ` [Freedreno] " kalyan_t
0 siblings, 1 reply; 4+ messages in thread
From: Rob Clark @ 2020-07-10 16:49 UTC (permalink / raw)
To: Kalyan Thota
Cc: dri-devel, linux-arm-msm, freedreno,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux Kernel Mailing List, Sean Paul, Kristian H. Kristensen,
Douglas Anderson, Krishna Manikandan, Raviteja Tamatam, nganji,
Stephen Boyd
On Thu, Jun 25, 2020 at 5:46 AM Kalyan Thota <kalyan_t@codeaurora.org> wrote:
>
> 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
>
> Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index 8f2357d..23061fd 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -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
> },
> };
>
> @@ -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),
> };
>
> /*************************************************************
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Freedreno] [v1] drm/msm/dpu: enumerate second cursor pipe for external interface
2020-07-10 16:49 ` Rob Clark
@ 2020-07-13 10:18 ` kalyan_t
2020-07-13 14:14 ` Rob Clark
0 siblings, 1 reply; 4+ messages in thread
From: kalyan_t @ 2020-07-13 10:18 UTC (permalink / raw)
To: Rob Clark
Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Krishna Manikandan, linux-arm-msm, Raviteja Tamatam,
Linux Kernel Mailing List, dri-devel, Douglas Anderson, nganji,
Sean Paul, Kristian H. Kristensen, Stephen Boyd, freedreno
On 2020-07-10 22:19, Rob Clark wrote:
> On Thu, Jun 25, 2020 at 5:46 AM Kalyan Thota <kalyan_t@codeaurora.org>
> wrote:
>>
>> 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
>>
>> Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org>
>> ---
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> index 8f2357d..23061fd 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> @@ -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
Yes Rob, the offset was wrong which i corrected in this patch.
>
>> },
>> };
>>
>> @@ -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),
>> };
>>
>> /*************************************************************
>> --
>> 1.9.1
>>
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Freedreno] [v1] drm/msm/dpu: enumerate second cursor pipe for external interface
2020-07-13 10:18 ` [Freedreno] " kalyan_t
@ 2020-07-13 14:14 ` Rob Clark
0 siblings, 0 replies; 4+ messages in thread
From: Rob Clark @ 2020-07-13 14:14 UTC (permalink / raw)
To: Kalyan Thota
Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Krishna Manikandan, linux-arm-msm, Raviteja Tamatam,
Linux Kernel Mailing List, dri-devel, Douglas Anderson, nganji,
Sean Paul, Kristian H. Kristensen, Stephen Boyd, freedreno
On Mon, Jul 13, 2020 at 3:18 AM <kalyan_t@codeaurora.org> wrote:
>
> On 2020-07-10 22:19, Rob Clark wrote:
> > On Thu, Jun 25, 2020 at 5:46 AM Kalyan Thota <kalyan_t@codeaurora.org>
> > wrote:
> >>
> >> 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
> >>
> >> Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org>
> >> ---
> >> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ++++++------
> >> 1 file changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> >> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> >> index 8f2357d..23061fd 100644
> >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> >> @@ -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
> Yes 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-13 14:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-25 12:45 [v1] drm/msm/dpu: enumerate second cursor pipe for external interface Kalyan Thota
2020-07-10 16:49 ` Rob Clark
2020-07-13 10:18 ` [Freedreno] " kalyan_t
2020-07-13 14:14 ` Rob Clark
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).