Commit d16b77dd authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop duplicate vig_sblk instances 



After fixing scaler version we are sure that sm8450 and sc8280xp vig
sblk's are duplicates of sm8250_vig_sblk and thus can be dropped.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/530876/
Link: https://lore.kernel.org/r/20230404130622.509628-34-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 5a7e3c00

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

+4 −4
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ static const struct dpu_ctl_cfg sc8280xp_ctl[] = { 


static const struct dpu_sspp_cfg sc8280xp_sspp[] = {

	SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, 0x2ac, VIG_SC7180_MASK,

		 sc8280xp_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),

		 sm8250_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),

	SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, 0x2ac, VIG_SC7180_MASK,

		 sc8280xp_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),

		 sm8250_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),

	SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, 0x2ac, VIG_SC7180_MASK,

		 sc8280xp_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),

		 sm8250_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),

	SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, 0x2ac, VIG_SC7180_MASK,

		 sc8280xp_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),

		 sm8250_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),

	SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, 0x2ac, DMA_SDM845_MASK,

		 sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),

	SSPP_BLK("sspp_9", SSPP_DMA1, 0x26000, 0x2ac, DMA_SDM845_MASK,

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

+4 −4
Original line number Diff line number Diff line
@@ -84,13 +84,13 @@ static const struct dpu_ctl_cfg sm8450_ctl[] = { 


static const struct dpu_sspp_cfg sm8450_sspp[] = {

	SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, 0x32c, VIG_SC7180_MASK,

		sm8450_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),

		sm8250_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),

	SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, 0x32c, VIG_SC7180_MASK,

		sm8450_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),

		sm8250_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),

	SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, 0x32c, VIG_SC7180_MASK,

		sm8450_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),

		sm8250_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),

	SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, 0x32c, VIG_SC7180_MASK,

		sm8450_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),

		sm8250_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),

	SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, 0x32c, DMA_SDM845_MASK,

		sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),

	SSPP_BLK("sspp_9", SSPP_DMA1, 0x26000, 0x32c, DMA_SDM845_MASK,

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c

+0 −18
Original line number Diff line number Diff line
@@ -432,15 +432,6 @@ static const struct dpu_sspp_sub_blks sm8250_vig_sblk_2 = 
static const struct dpu_sspp_sub_blks sm8250_vig_sblk_3 =

				_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED4);



static const struct dpu_sspp_sub_blks sm8450_vig_sblk_0 =

				_VIG_SBLK("0", 5, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8450_vig_sblk_1 =

				_VIG_SBLK("1", 6, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8450_vig_sblk_2 =

				_VIG_SBLK("2", 7, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8450_vig_sblk_3 =

				_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED4);



static const struct dpu_sspp_sub_blks sm8550_vig_sblk_0 =

				_VIG_SBLK("0", 7, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8550_vig_sblk_1 =
@@ -452,15 +443,6 @@ static const struct dpu_sspp_sub_blks sm8550_vig_sblk_3 = 
static const struct dpu_sspp_sub_blks sm8550_dma_sblk_4 = _DMA_SBLK("12", 5);

static const struct dpu_sspp_sub_blks sm8550_dma_sblk_5 = _DMA_SBLK("13", 6);



static const struct dpu_sspp_sub_blks sc8280xp_vig_sblk_0 =

				_VIG_SBLK("0", 5, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sc8280xp_vig_sblk_1 =

				_VIG_SBLK("1", 6, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sc8280xp_vig_sblk_2 =

				_VIG_SBLK("2", 7, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sc8280xp_vig_sblk_3 =

				_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED4);



#define _VIG_SBLK_NOSCALE(num, sdma_pri) \

	{ \

	.maxdwnscale = SSPP_UNITY_SCALE, \