Commit 79af5696 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: rename non-SmartDMA feature masks to be more explicit 



It is easy to skip or ignore the fact that the default SSPP feature
masks for SDM845+ don't include the SmartDMA bit (both during
development and during the review stage). Rename SSPP feature masks to
make it more explicit that using non-SmartDMA masks should not be an
exception rather than the rule.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/650425/
Link: https://lore.kernel.org/r/20250425-dpu-rework-vig-masks-v2-5-c71900687d08@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent 3f5e910b

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h

+5 −5
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { 
	{

		.name = "sspp_0", .id = SSPP_VIG0,

		.base = 0x4000, .len = 0x1f0,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_2_4,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,
@@ -80,7 +80,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { 
	}, {

		.name = "sspp_1", .id = SSPP_VIG1,

		.base = 0x6000, .len = 0x1f0,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_2_4,

		.xin_id = 4,

		.type = SSPP_TYPE_VIG,
@@ -88,7 +88,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { 
	}, {

		.name = "sspp_2", .id = SSPP_DMA0,

		.base = 0x24000, .len = 0x1f0,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 1,

		.type = SSPP_TYPE_DMA,
@@ -96,7 +96,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { 
	}, {

		.name = "sspp_9", .id = SSPP_DMA1,

		.base = 0x26000, .len = 0x1f0,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 5,

		.type = SSPP_TYPE_DMA,
@@ -104,7 +104,7 @@ static const struct dpu_sspp_cfg sm7150_sspp[] = { 
	}, {

		.name = "sspp_10", .id = SSPP_DMA2,

		.base = 0x28000, .len = 0x1f0,

		.features = DMA_CURSOR_SDM845_MASK,

		.features = DMA_CURSOR_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 9,

		.type = SSPP_TYPE_DMA,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { 
	{

		.name = "sspp_0", .id = SSPP_VIG0,

		.base = 0x4000, .len = 0x1f0,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_2_4,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,
@@ -77,7 +77,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { 
	}, {

		.name = "sspp_8", .id = SSPP_DMA0,

		.base = 0x24000, .len = 0x1f0,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 1,

		.type = SSPP_TYPE_DMA,
@@ -85,7 +85,7 @@ static const struct dpu_sspp_cfg sm6125_sspp[] = { 
	}, {

		.name = "sspp_9", .id = SSPP_DMA1,

		.base = 0x26000, .len = 0x1f0,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 5,

		.type = SSPP_TYPE_DMA,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h

+4 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { 
	{

		.name = "sspp_0", .id = SSPP_VIG0,

		.base = 0x4000, .len = 0x1f8,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,
@@ -59,7 +59,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { 
	}, {

		.name = "sspp_8", .id = SSPP_DMA0,

		.base = 0x24000, .len = 0x1f8,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 1,

		.type = SSPP_TYPE_DMA,
@@ -67,7 +67,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { 
	}, {

		.name = "sspp_9", .id = SSPP_DMA1,

		.base = 0x26000, .len = 0x1f8,

		.features = DMA_CURSOR_SDM845_MASK,

		.features = DMA_CURSOR_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 5,

		.type = SSPP_TYPE_DMA,
@@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { 
	}, {

		.name = "sspp_10", .id = SSPP_DMA2,

		.base = 0x28000, .len = 0x1f8,

		.features = DMA_CURSOR_SDM845_MASK,

		.features = DMA_CURSOR_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 9,

		.type = SSPP_TYPE_DMA,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const struct dpu_sspp_cfg sm6115_sspp[] = { 
	{

		.name = "sspp_0", .id = SSPP_VIG0,

		.base = 0x4000, .len = 0x1f8,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,
@@ -46,7 +46,7 @@ static const struct dpu_sspp_cfg sm6115_sspp[] = { 
	}, {

		.name = "sspp_8", .id = SSPP_DMA0,

		.base = 0x24000, .len = 0x1f8,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 1,

		.type = SSPP_TYPE_DMA,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { 
	{

		.name = "sspp_0", .id = SSPP_VIG0,

		.base = 0x4000, .len = 0x1f8,

		.features = VIG_SDM845_MASK,

		.features = VIG_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,
@@ -67,7 +67,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { 
	}, {

		.name = "sspp_8", .id = SSPP_DMA0,

		.base = 0x24000, .len = 0x1f8,

		.features = DMA_SDM845_MASK,

		.features = DMA_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 1,

		.type = SSPP_TYPE_DMA,
@@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { 
	}, {

		.name = "sspp_9", .id = SSPP_DMA1,

		.base = 0x26000, .len = 0x1f8,

		.features = DMA_CURSOR_SDM845_MASK,

		.features = DMA_CURSOR_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 5,

		.type = SSPP_TYPE_DMA,
@@ -83,7 +83,7 @@ static const struct dpu_sspp_cfg sm6350_sspp[] = { 
	}, {

		.name = "sspp_10", .id = SSPP_DMA2,

		.base = 0x28000, .len = 0x1f8,

		.features = DMA_CURSOR_SDM845_MASK,

		.features = DMA_CURSOR_SDM845_MASK_NO_SDMA,

		.sblk = &dpu_dma_sblk,

		.xin_id = 9,

		.type = SSPP_TYPE_DMA,