Commit 223fb06f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/gpu: drop duplicating VIG feature masks 



After folding QSEED3LITE and QSEED4 feature bits into QSEED3_COMPATIBLE
several VIG feature masks became equal. Drop these duplicates.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/570107/
Link: https://lore.kernel.org/r/20231201234234.2065610-11-dmitry.baryshkov@linaro.org
parent 193838ac

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

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

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

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

		.features = VIG_SM6125_MASK,

		.features = VIG_SDM845_MASK,

		.sblk = &dpu_vig_sblk_qseed3_2_4,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,

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

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

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

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

		.features = VIG_SC7180_MASK_SDMA,

		.features = VIG_SDM845_MASK_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

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

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

		.base = 0x6000, .len = 0x1f8,

		.features = VIG_SC7180_MASK_SDMA,

		.features = VIG_SDM845_MASK_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 4,

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

		.name = "sspp_2", .id = SSPP_VIG2,

		.base = 0x8000, .len = 0x1f8,

		.features = VIG_SC7180_MASK_SDMA,

		.features = VIG_SDM845_MASK_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 8,

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

		.name = "sspp_3", .id = SSPP_VIG3,

		.base = 0xa000, .len = 0x1f8,

		.features = VIG_SC7180_MASK_SDMA,

		.features = VIG_SDM845_MASK_SDMA,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 12,

		.type = SSPP_TYPE_VIG,

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

+1 −1
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_SC7180_MASK,

		.features = VIG_SDM845_MASK,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,

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

+1 −1
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_SC7180_MASK,

		.features = VIG_SDM845_MASK,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,

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

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

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

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

		.features = VIG_SC7180_MASK,

		.features = VIG_SDM845_MASK,

		.sblk = &dpu_vig_sblk_qseed3_3_0,

		.xin_id = 0,

		.type = SSPP_TYPE_VIG,