Commit 460c410f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: duplicate sdm845 catalog entries 



Duplicate some of sdm845 catalog entries to remove dependencies between
DPU major generations.

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/530849/
Link: https://lore.kernel.org/r/20230404130622.509628-21-dmitry.baryshkov@linaro.org


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

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

+17 −2
Original line number Diff line number Diff line
@@ -111,6 +111,21 @@ static const struct dpu_lm_cfg msm8998_lm[] = { 
		&msm8998_lm_sblk, PINGPONG_3, LM_1, 0),

};



static const struct dpu_pingpong_cfg msm8998_pp[] = {

	PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

	PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

};



static const struct dpu_dspp_cfg msm8998_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_MSM8998_MASK,

		 &msm8998_dspp_sblk),
@@ -174,8 +189,8 @@ static const struct dpu_mdss_cfg msm8998_dpu_cfg = { 
	.mixer = msm8998_lm,

	.dspp_count = ARRAY_SIZE(msm8998_dspp),

	.dspp = msm8998_dspp,

	.pingpong_count = ARRAY_SIZE(sdm845_pp),

	.pingpong = sdm845_pp,

	.pingpong_count = ARRAY_SIZE(msm8998_pp),

	.pingpong = msm8998_pp,

	.intf_count = ARRAY_SIZE(msm8998_intf),

	.intf = msm8998_intf,

	.vbif_count = ARRAY_SIZE(msm8998_vbif),

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

+39 −4
Original line number Diff line number Diff line
@@ -26,6 +26,22 @@ static const struct dpu_ubwc_cfg sm8150_ubwc_cfg = { 
	.highest_bank_bit = 0x2,

};



static const struct dpu_mdp_cfg sm8150_mdp[] = {

	{

	.name = "top_0", .id = MDP_TOP,

	.base = 0x0, .len = 0x45c,

	.features = BIT(DPU_MDP_AUDIO_SELECT),

	.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },

	.clk_ctrls[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },

	.clk_ctrls[DPU_CLK_CTRL_VIG2] = { .reg_off = 0x2bc, .bit_off = 0 },

	.clk_ctrls[DPU_CLK_CTRL_VIG3] = { .reg_off = 0x2c4, .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_DMA2] = { .reg_off = 0x2bc, .bit_off = 8 },

	.clk_ctrls[DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 8 },

	},

};



static const struct dpu_ctl_cfg sm8150_ctl[] = {

	{

	.name = "ctl_0", .id = CTL_0,
@@ -65,6 +81,25 @@ static const struct dpu_ctl_cfg sm8150_ctl[] = { 
	},

};



static const struct dpu_sspp_cfg sm8150_sspp[] = {

	SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, 0x1f0, VIG_SDM845_MASK,

		sdm845_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),

	SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, 0x1f0, VIG_SDM845_MASK,

		sdm845_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),

	SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, 0x1f0, VIG_SDM845_MASK,

		sdm845_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),

	SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, 0x1f0, VIG_SDM845_MASK,

		sdm845_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),

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

		sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),

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

		sdm845_dma_sblk_1, 5, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA1),

	SSPP_BLK("sspp_10", SSPP_DMA2, 0x28000, 0x1f0, DMA_CURSOR_SDM845_MASK,

		sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA2),

	SSPP_BLK("sspp_11", SSPP_DMA3, 0x2a000, 0x1f0, DMA_CURSOR_SDM845_MASK,

		sdm845_dma_sblk_3, 13, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA3),

};



static const struct dpu_lm_cfg sm8150_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
@@ -164,12 +199,12 @@ static const struct dpu_perf_cfg sm8150_perf_data = { 
static const struct dpu_mdss_cfg sm8150_dpu_cfg = {

	.caps = &sm8150_dpu_caps,

	.ubwc = &sm8150_ubwc_cfg,

	.mdp_count = ARRAY_SIZE(sdm845_mdp),

	.mdp = sdm845_mdp,

	.mdp_count = ARRAY_SIZE(sm8150_mdp),

	.mdp = sm8150_mdp,

	.ctl_count = ARRAY_SIZE(sm8150_ctl),

	.ctl = sm8150_ctl,

	.sspp_count = ARRAY_SIZE(sdm845_sspp),

	.sspp = sdm845_sspp,

	.sspp_count = ARRAY_SIZE(sm8150_sspp),

	.sspp = sm8150_sspp,

	.mixer_count = ARRAY_SIZE(sm8150_lm),

	.mixer = sm8150_lm,

	.dspp_count = ARRAY_SIZE(sm8150_dspp),

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

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static const struct dpu_mdss_cfg sc8180x_dpu_cfg = { 
	.mdp = sc8180x_mdp,

	.ctl_count = ARRAY_SIZE(sm8150_ctl),

	.ctl = sm8150_ctl,

	.sspp_count = ARRAY_SIZE(sdm845_sspp),

	.sspp = sdm845_sspp,

	.sspp_count = ARRAY_SIZE(sm8150_sspp),

	.sspp = sm8150_sspp,

	.mixer_count = ARRAY_SIZE(sm8150_lm),

	.mixer = sm8150_lm,

	.pingpong_count = ARRAY_SIZE(sm8150_pp),

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

+2 −2
Original line number Diff line number Diff line
@@ -875,10 +875,10 @@ static const struct dpu_qos_lut_entry sc7180_qos_nrt[] = { 
 * Hardware catalog

 *************************************************************/



#include "catalog/dpu_4_0_sdm845.h"



#include "catalog/dpu_3_0_msm8998.h"



#include "catalog/dpu_4_0_sdm845.h"



#include "catalog/dpu_5_0_sm8150.h"

#include "catalog/dpu_5_1_sc8180x.h"