From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reworking of the catalog dropped the SmartDMA feature bit on the SM8150
platform. Renable SmartDMA support on this SoC.
Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
index 23188290001ffb45563a9953a9f710bacb4dac89..fe4de5b31644de33b77a882fa21a18f48ecd1790 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
{
.name = "sspp_0", .id = SSPP_VIG0,
.base = 0x4000, .len = 0x1f0,
- .features = VIG_SDM845_MASK,
+ .features = VIG_SDM845_MASK_SDMA,
.sblk = &dpu_vig_sblk_qseed3_1_4,
.xin_id = 0,
.type = SSPP_TYPE_VIG,
@@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_1", .id = SSPP_VIG1,
.base = 0x6000, .len = 0x1f0,
- .features = VIG_SDM845_MASK,
+ .features = VIG_SDM845_MASK_SDMA,
.sblk = &dpu_vig_sblk_qseed3_1_4,
.xin_id = 4,
.type = SSPP_TYPE_VIG,
@@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_2", .id = SSPP_VIG2,
.base = 0x8000, .len = 0x1f0,
- .features = VIG_SDM845_MASK,
+ .features = VIG_SDM845_MASK_SDMA,
.sblk = &dpu_vig_sblk_qseed3_1_4,
.xin_id = 8,
.type = SSPP_TYPE_VIG,
@@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_3", .id = SSPP_VIG3,
.base = 0xa000, .len = 0x1f0,
- .features = VIG_SDM845_MASK,
+ .features = VIG_SDM845_MASK_SDMA,
.sblk = &dpu_vig_sblk_qseed3_1_4,
.xin_id = 12,
.type = SSPP_TYPE_VIG,
@@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_8", .id = SSPP_DMA0,
.base = 0x24000, .len = 0x1f0,
- .features = DMA_SDM845_MASK,
+ .features = DMA_SDM845_MASK_SDMA,
.sblk = &dpu_dma_sblk,
.xin_id = 1,
.type = SSPP_TYPE_DMA,
@@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_9", .id = SSPP_DMA1,
.base = 0x26000, .len = 0x1f0,
- .features = DMA_SDM845_MASK,
+ .features = DMA_SDM845_MASK_SDMA,
.sblk = &dpu_dma_sblk,
.xin_id = 5,
.type = SSPP_TYPE_DMA,
@@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_10", .id = SSPP_DMA2,
.base = 0x28000, .len = 0x1f0,
- .features = DMA_CURSOR_SDM845_MASK,
+ .features = DMA_CURSOR_SDM845_MASK_SDMA,
.sblk = &dpu_dma_sblk,
.xin_id = 9,
.type = SSPP_TYPE_DMA,
@@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
}, {
.name = "sspp_11", .id = SSPP_DMA3,
.base = 0x2a000, .len = 0x1f0,
- .features = DMA_CURSOR_SDM845_MASK,
+ .features = DMA_CURSOR_SDM845_MASK_SDMA,
.sblk = &dpu_dma_sblk,
.xin_id = 13,
.type = SSPP_TYPE_DMA,
--
2.39.5
On 3/7/2025 9:38 PM, Dmitry Baryshkov wrote:
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> Reworking of the catalog dropped the SmartDMA feature bit on the SM8150
> platform. Renable SmartDMA support on this SoC.
>
> Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries")
Hi Dmitry,
The code LGTM, but was just wondering why there's a fixes tag for the
first two patches but not for the other catalog changes.
Is there some context I'm missing with regards to this?
Thanks,
Jessica Zhang
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> index 23188290001ffb45563a9953a9f710bacb4dac89..fe4de5b31644de33b77a882fa21a18f48ecd1790 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> @@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> {
> .name = "sspp_0", .id = SSPP_VIG0,
> .base = 0x4000, .len = 0x1f0,
> - .features = VIG_SDM845_MASK,
> + .features = VIG_SDM845_MASK_SDMA,
> .sblk = &dpu_vig_sblk_qseed3_1_4,
> .xin_id = 0,
> .type = SSPP_TYPE_VIG,
> @@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_1", .id = SSPP_VIG1,
> .base = 0x6000, .len = 0x1f0,
> - .features = VIG_SDM845_MASK,
> + .features = VIG_SDM845_MASK_SDMA,
> .sblk = &dpu_vig_sblk_qseed3_1_4,
> .xin_id = 4,
> .type = SSPP_TYPE_VIG,
> @@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_2", .id = SSPP_VIG2,
> .base = 0x8000, .len = 0x1f0,
> - .features = VIG_SDM845_MASK,
> + .features = VIG_SDM845_MASK_SDMA,
> .sblk = &dpu_vig_sblk_qseed3_1_4,
> .xin_id = 8,
> .type = SSPP_TYPE_VIG,
> @@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_3", .id = SSPP_VIG3,
> .base = 0xa000, .len = 0x1f0,
> - .features = VIG_SDM845_MASK,
> + .features = VIG_SDM845_MASK_SDMA,
> .sblk = &dpu_vig_sblk_qseed3_1_4,
> .xin_id = 12,
> .type = SSPP_TYPE_VIG,
> @@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_8", .id = SSPP_DMA0,
> .base = 0x24000, .len = 0x1f0,
> - .features = DMA_SDM845_MASK,
> + .features = DMA_SDM845_MASK_SDMA,
> .sblk = &dpu_dma_sblk,
> .xin_id = 1,
> .type = SSPP_TYPE_DMA,
> @@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_9", .id = SSPP_DMA1,
> .base = 0x26000, .len = 0x1f0,
> - .features = DMA_SDM845_MASK,
> + .features = DMA_SDM845_MASK_SDMA,
> .sblk = &dpu_dma_sblk,
> .xin_id = 5,
> .type = SSPP_TYPE_DMA,
> @@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_10", .id = SSPP_DMA2,
> .base = 0x28000, .len = 0x1f0,
> - .features = DMA_CURSOR_SDM845_MASK,
> + .features = DMA_CURSOR_SDM845_MASK_SDMA,
> .sblk = &dpu_dma_sblk,
> .xin_id = 9,
> .type = SSPP_TYPE_DMA,
> @@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> }, {
> .name = "sspp_11", .id = SSPP_DMA3,
> .base = 0x2a000, .len = 0x1f0,
> - .features = DMA_CURSOR_SDM845_MASK,
> + .features = DMA_CURSOR_SDM845_MASK_SDMA,
> .sblk = &dpu_dma_sblk,
> .xin_id = 13,
> .type = SSPP_TYPE_DMA,
>
On Fri, Apr 25, 2025 at 11:26:20AM -0700, Jessica Zhang wrote:
>
>
> On 3/7/2025 9:38 PM, Dmitry Baryshkov wrote:
> > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> >
> > Reworking of the catalog dropped the SmartDMA feature bit on the SM8150
> > platform. Renable SmartDMA support on this SoC.
> >
> > Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries")
>
> Hi Dmitry,
>
> The code LGTM, but was just wondering why there's a fixes tag for the first
> two patches but not for the other catalog changes.
>
> Is there some context I'm missing with regards to this?
As I wrote in the commit message, SmartDMA for these two platforms was
enabled previously, but then it got disabled by the mistake in the
commit 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries").
For the rest of the platforms SmartDMA supoprt was never enabled, so
no need for Fixes tags.
>
> Thanks,
>
> Jessica Zhang
>
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > ---
> > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> > index 23188290001ffb45563a9953a9f710bacb4dac89..fe4de5b31644de33b77a882fa21a18f48ecd1790 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> > @@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > {
> > .name = "sspp_0", .id = SSPP_VIG0,
> > .base = 0x4000, .len = 0x1f0,
> > - .features = VIG_SDM845_MASK,
> > + .features = VIG_SDM845_MASK_SDMA,
> > .sblk = &dpu_vig_sblk_qseed3_1_4,
> > .xin_id = 0,
> > .type = SSPP_TYPE_VIG,
> > @@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_1", .id = SSPP_VIG1,
> > .base = 0x6000, .len = 0x1f0,
> > - .features = VIG_SDM845_MASK,
> > + .features = VIG_SDM845_MASK_SDMA,
> > .sblk = &dpu_vig_sblk_qseed3_1_4,
> > .xin_id = 4,
> > .type = SSPP_TYPE_VIG,
> > @@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_2", .id = SSPP_VIG2,
> > .base = 0x8000, .len = 0x1f0,
> > - .features = VIG_SDM845_MASK,
> > + .features = VIG_SDM845_MASK_SDMA,
> > .sblk = &dpu_vig_sblk_qseed3_1_4,
> > .xin_id = 8,
> > .type = SSPP_TYPE_VIG,
> > @@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_3", .id = SSPP_VIG3,
> > .base = 0xa000, .len = 0x1f0,
> > - .features = VIG_SDM845_MASK,
> > + .features = VIG_SDM845_MASK_SDMA,
> > .sblk = &dpu_vig_sblk_qseed3_1_4,
> > .xin_id = 12,
> > .type = SSPP_TYPE_VIG,
> > @@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_8", .id = SSPP_DMA0,
> > .base = 0x24000, .len = 0x1f0,
> > - .features = DMA_SDM845_MASK,
> > + .features = DMA_SDM845_MASK_SDMA,
> > .sblk = &dpu_dma_sblk,
> > .xin_id = 1,
> > .type = SSPP_TYPE_DMA,
> > @@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_9", .id = SSPP_DMA1,
> > .base = 0x26000, .len = 0x1f0,
> > - .features = DMA_SDM845_MASK,
> > + .features = DMA_SDM845_MASK_SDMA,
> > .sblk = &dpu_dma_sblk,
> > .xin_id = 5,
> > .type = SSPP_TYPE_DMA,
> > @@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_10", .id = SSPP_DMA2,
> > .base = 0x28000, .len = 0x1f0,
> > - .features = DMA_CURSOR_SDM845_MASK,
> > + .features = DMA_CURSOR_SDM845_MASK_SDMA,
> > .sblk = &dpu_dma_sblk,
> > .xin_id = 9,
> > .type = SSPP_TYPE_DMA,
> > @@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
> > }, {
> > .name = "sspp_11", .id = SSPP_DMA3,
> > .base = 0x2a000, .len = 0x1f0,
> > - .features = DMA_CURSOR_SDM845_MASK,
> > + .features = DMA_CURSOR_SDM845_MASK_SDMA,
> > .sblk = &dpu_dma_sblk,
> > .xin_id = 13,
> > .type = SSPP_TYPE_DMA,
> >
>
--
With best wishes
Dmitry
On 4/25/2025 11:53 AM, Dmitry Baryshkov wrote:
> On Fri, Apr 25, 2025 at 11:26:20AM -0700, Jessica Zhang wrote:
>>
>>
>> On 3/7/2025 9:38 PM, Dmitry Baryshkov wrote:
>>> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>>
>>> Reworking of the catalog dropped the SmartDMA feature bit on the SM8150
>>> platform. Renable SmartDMA support on this SoC.
>>>
>>> Fixes: 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries")
>>
>> Hi Dmitry,
>>
>> The code LGTM, but was just wondering why there's a fixes tag for the first
>> two patches but not for the other catalog changes.
>>
>> Is there some context I'm missing with regards to this?
>
> As I wrote in the commit message, SmartDMA for these two platforms was
> enabled previously, but then it got disabled by the mistake in the
> commit 460c410f02e4 ("drm/msm/dpu: duplicate sdm845 catalog entries").
> For the rest of the platforms SmartDMA supoprt was never enabled, so
> no need for Fixes tags.
Ah, sorry I missed that sdm845_sspp has the SDMA feature flag.
Reviewed-by: Jessica Zhang <quic_jesszhan@quicinc.com>
>
>>
>> Thanks,
>>
>> Jessica Zhang
>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>> ---
>>> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++--------
>>> 1 file changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>>> index 23188290001ffb45563a9953a9f710bacb4dac89..fe4de5b31644de33b77a882fa21a18f48ecd1790 100644
>>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>>> @@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> {
>>> .name = "sspp_0", .id = SSPP_VIG0,
>>> .base = 0x4000, .len = 0x1f0,
>>> - .features = VIG_SDM845_MASK,
>>> + .features = VIG_SDM845_MASK_SDMA,
>>> .sblk = &dpu_vig_sblk_qseed3_1_4,
>>> .xin_id = 0,
>>> .type = SSPP_TYPE_VIG,
>>> @@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_1", .id = SSPP_VIG1,
>>> .base = 0x6000, .len = 0x1f0,
>>> - .features = VIG_SDM845_MASK,
>>> + .features = VIG_SDM845_MASK_SDMA,
>>> .sblk = &dpu_vig_sblk_qseed3_1_4,
>>> .xin_id = 4,
>>> .type = SSPP_TYPE_VIG,
>>> @@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_2", .id = SSPP_VIG2,
>>> .base = 0x8000, .len = 0x1f0,
>>> - .features = VIG_SDM845_MASK,
>>> + .features = VIG_SDM845_MASK_SDMA,
>>> .sblk = &dpu_vig_sblk_qseed3_1_4,
>>> .xin_id = 8,
>>> .type = SSPP_TYPE_VIG,
>>> @@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_3", .id = SSPP_VIG3,
>>> .base = 0xa000, .len = 0x1f0,
>>> - .features = VIG_SDM845_MASK,
>>> + .features = VIG_SDM845_MASK_SDMA,
>>> .sblk = &dpu_vig_sblk_qseed3_1_4,
>>> .xin_id = 12,
>>> .type = SSPP_TYPE_VIG,
>>> @@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_8", .id = SSPP_DMA0,
>>> .base = 0x24000, .len = 0x1f0,
>>> - .features = DMA_SDM845_MASK,
>>> + .features = DMA_SDM845_MASK_SDMA,
>>> .sblk = &dpu_dma_sblk,
>>> .xin_id = 1,
>>> .type = SSPP_TYPE_DMA,
>>> @@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_9", .id = SSPP_DMA1,
>>> .base = 0x26000, .len = 0x1f0,
>>> - .features = DMA_SDM845_MASK,
>>> + .features = DMA_SDM845_MASK_SDMA,
>>> .sblk = &dpu_dma_sblk,
>>> .xin_id = 5,
>>> .type = SSPP_TYPE_DMA,
>>> @@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_10", .id = SSPP_DMA2,
>>> .base = 0x28000, .len = 0x1f0,
>>> - .features = DMA_CURSOR_SDM845_MASK,
>>> + .features = DMA_CURSOR_SDM845_MASK_SDMA,
>>> .sblk = &dpu_dma_sblk,
>>> .xin_id = 9,
>>> .type = SSPP_TYPE_DMA,
>>> @@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = {
>>> }, {
>>> .name = "sspp_11", .id = SSPP_DMA3,
>>> .base = 0x2a000, .len = 0x1f0,
>>> - .features = DMA_CURSOR_SDM845_MASK,
>>> + .features = DMA_CURSOR_SDM845_MASK_SDMA,
>>> .sblk = &dpu_dma_sblk,
>>> .xin_id = 13,
>>> .type = SSPP_TYPE_DMA,
>>>
>>
>
© 2016 - 2026 Red Hat, Inc.