Commit 078f766e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov

drm/msm/dpu: drop the regdma configuration

The regdma is currently not used by the current driver. We have no way
to practically verify that the regdma is described correctly. Drop it
now.
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/533148/
Link: https://lore.kernel.org/r/20230420222558.1208887-1-dmitry.baryshkov@linaro.orgSigned-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 8d6dad49
...@@ -195,7 +195,6 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = { ...@@ -195,7 +195,6 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = {
.intf = msm8998_intf, .intf = msm8998_intf,
.vbif_count = ARRAY_SIZE(msm8998_vbif), .vbif_count = ARRAY_SIZE(msm8998_vbif),
.vbif = msm8998_vbif, .vbif = msm8998_vbif,
.reg_dma_count = 0,
.perf = &msm8998_perf_data, .perf = &msm8998_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -193,8 +193,6 @@ const struct dpu_mdss_cfg dpu_sdm845_cfg = { ...@@ -193,8 +193,6 @@ const struct dpu_mdss_cfg dpu_sdm845_cfg = {
.intf = sdm845_intf, .intf = sdm845_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sdm845_regdma,
.perf = &sdm845_perf_data, .perf = &sdm845_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -220,8 +220,6 @@ const struct dpu_mdss_cfg dpu_sm8150_cfg = { ...@@ -220,8 +220,6 @@ const struct dpu_mdss_cfg dpu_sm8150_cfg = {
.intf = sm8150_intf, .intf = sm8150_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sm8150_regdma,
.perf = &sm8150_perf_data, .perf = &sm8150_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -222,8 +222,6 @@ const struct dpu_mdss_cfg dpu_sc8180x_cfg = { ...@@ -222,8 +222,6 @@ const struct dpu_mdss_cfg dpu_sc8180x_cfg = {
.intf = sc8180x_intf, .intf = sc8180x_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sm8150_regdma,
.perf = &sc8180x_perf_data, .perf = &sc8180x_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -228,8 +228,6 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg = { ...@@ -228,8 +228,6 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg = {
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.wb_count = ARRAY_SIZE(sm8250_wb), .wb_count = ARRAY_SIZE(sm8250_wb),
.wb = sm8250_wb, .wb = sm8250_wb,
.reg_dma_count = 1,
.dma_cfg = &sm8250_regdma,
.perf = &sm8250_perf_data, .perf = &sm8250_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -143,8 +143,6 @@ const struct dpu_mdss_cfg dpu_sc7180_cfg = { ...@@ -143,8 +143,6 @@ const struct dpu_mdss_cfg dpu_sc7180_cfg = {
.wb = sc7180_wb, .wb = sc7180_wb,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sdm845_regdma,
.perf = &sc7180_perf_data, .perf = &sc7180_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -211,8 +211,6 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg = { ...@@ -211,8 +211,6 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg = {
.intf = sm8350_intf, .intf = sm8350_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sm8350_regdma,
.perf = &sm8350_perf_data, .perf = &sm8350_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -203,8 +203,6 @@ const struct dpu_mdss_cfg dpu_sc8280xp_cfg = { ...@@ -203,8 +203,6 @@ const struct dpu_mdss_cfg dpu_sc8280xp_cfg = {
.intf = sc8280xp_intf, .intf = sc8280xp_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sc8280xp_regdma,
.perf = &sc8280xp_perf_data, .perf = &sc8280xp_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -219,8 +219,6 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg = { ...@@ -219,8 +219,6 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg = {
.intf = sm8450_intf, .intf = sm8450_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sm8450_regdma,
.perf = &sm8450_perf_data, .perf = &sm8450_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -224,8 +224,6 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg = { ...@@ -224,8 +224,6 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg = {
.intf = sm8550_intf, .intf = sm8550_intf,
.vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif_count = ARRAY_SIZE(sdm845_vbif),
.vbif = sdm845_vbif, .vbif = sdm845_vbif,
.reg_dma_count = 1,
.dma_cfg = &sm8450_regdma,
.perf = &sm8550_perf_data, .perf = &sm8550_perf_data,
.mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \ .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
BIT(MDP_SSPP_TOP0_INTR2) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
......
...@@ -650,46 +650,6 @@ static const struct dpu_vbif_cfg sdm845_vbif[] = { ...@@ -650,46 +650,6 @@ static const struct dpu_vbif_cfg sdm845_vbif[] = {
}, },
}; };
static const struct dpu_reg_dma_cfg sc8280xp_regdma = {
.base = 0x0,
.version = 0x00020000,
.trigger_sel_off = 0x119c,
.xin_id = 7,
.clk_ctrl = DPU_CLK_CTRL_REG_DMA,
};
static const struct dpu_reg_dma_cfg sdm845_regdma = {
.base = 0x0, .version = 0x1, .trigger_sel_off = 0x119c
};
static const struct dpu_reg_dma_cfg sm8150_regdma = {
.base = 0x0, .version = 0x00010001, .trigger_sel_off = 0x119c
};
static const struct dpu_reg_dma_cfg sm8250_regdma = {
.base = 0x0,
.version = 0x00010002,
.trigger_sel_off = 0x119c,
.xin_id = 7,
.clk_ctrl = DPU_CLK_CTRL_REG_DMA,
};
static const struct dpu_reg_dma_cfg sm8350_regdma = {
.base = 0x400,
.version = 0x00020000,
.trigger_sel_off = 0x119c,
.xin_id = 7,
.clk_ctrl = DPU_CLK_CTRL_REG_DMA,
};
static const struct dpu_reg_dma_cfg sm8450_regdma = {
.base = 0x0,
.version = 0x00020000,
.trigger_sel_off = 0x119c,
.xin_id = 7,
.clk_ctrl = DPU_CLK_CTRL_REG_DMA,
};
/************************************************************* /*************************************************************
* PERF data config * PERF data config
*************************************************************/ *************************************************************/
......
...@@ -720,21 +720,6 @@ struct dpu_vbif_cfg { ...@@ -720,21 +720,6 @@ struct dpu_vbif_cfg {
u32 memtype_count; u32 memtype_count;
u32 memtype[MAX_XIN_COUNT]; u32 memtype[MAX_XIN_COUNT];
}; };
/**
* struct dpu_reg_dma_cfg - information of lut dma blocks
* @id enum identifying this block
* @base register offset of this block
* @features bit mask identifying sub-blocks/features
* @version version of lutdma hw block
* @trigger_sel_off offset to trigger select registers of lutdma
*/
struct dpu_reg_dma_cfg {
DPU_HW_BLK_INFO;
u32 version;
u32 trigger_sel_off;
u32 xin_id;
enum dpu_clk_ctrl_type clk_ctrl;
};
/** /**
* Define CDP use cases * Define CDP use cases
...@@ -850,9 +835,6 @@ struct dpu_mdss_cfg { ...@@ -850,9 +835,6 @@ struct dpu_mdss_cfg {
u32 wb_count; u32 wb_count;
const struct dpu_wb_cfg *wb; const struct dpu_wb_cfg *wb;
u32 reg_dma_count;
const struct dpu_reg_dma_cfg *dma_cfg;
u32 ad_count; u32 ad_count;
u32 dspp_count; u32 dspp_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment