mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 03:15:31 +09:00
drm/msm/dpu: drop enum dpu_mdp and MDP_TOP value
Since there is always just a single MDP_TOP instance, drop the enum dpu_mdp and corresponding index value. Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> Tested-by: Marijn Suijten <marijn.suijten@somainline.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/545357/ Link: https://lore.kernel.org/r/20230704022136.130522-6-dmitry.baryshkov@linaro.org
This commit is contained in:
@@ -27,7 +27,7 @@ static const struct dpu_ubwc_cfg msm8998_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg msm8998_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x458,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -27,7 +27,7 @@ static const struct dpu_ubwc_cfg sdm845_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sdm845_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x45c,
|
||||
.features = BIT(DPU_MDP_AUDIO_SELECT) | BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -27,7 +27,7 @@ static const struct dpu_ubwc_cfg sm8150_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm8150_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x45c,
|
||||
.features = BIT(DPU_MDP_AUDIO_SELECT),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -27,7 +27,7 @@ static const struct dpu_ubwc_cfg sc8180x_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sc8180x_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x45c,
|
||||
.features = BIT(DPU_MDP_AUDIO_SELECT),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -26,7 +26,7 @@ static const struct dpu_ubwc_cfg sm8250_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm8250_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -23,7 +23,7 @@ static const struct dpu_ubwc_cfg sc7180_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sc7180_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -24,7 +24,7 @@ static const struct dpu_ubwc_cfg sm6115_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm6115_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -26,7 +26,7 @@ static const struct dpu_ubwc_cfg sm6350_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm6350_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -21,7 +21,7 @@ static const struct dpu_ubwc_cfg qcm2290_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg qcm2290_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -25,7 +25,7 @@ static const struct dpu_ubwc_cfg sm6375_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm6375_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -25,7 +25,7 @@ static const struct dpu_ubwc_cfg sm8350_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm8350_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = 0,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -24,7 +24,7 @@ static const struct dpu_ubwc_cfg sc7280_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sc7280_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x2014,
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
.clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2ac, .bit_off = 8 },
|
||||
|
||||
@@ -26,7 +26,7 @@ static const struct dpu_ubwc_cfg sc8280xp_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sc8280xp_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = BIT(DPU_MDP_PERIPH_0_REMOVED),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -26,7 +26,7 @@ static const struct dpu_ubwc_cfg sm8450_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm8450_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x494,
|
||||
.features = BIT(DPU_MDP_PERIPH_0_REMOVED),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
|
||||
@@ -25,7 +25,7 @@ static const struct dpu_ubwc_cfg sm8550_ubwc_cfg = {
|
||||
};
|
||||
|
||||
static const struct dpu_mdp_cfg sm8550_mdp = {
|
||||
.name = "top_0", .id = MDP_TOP,
|
||||
.name = "top_0",
|
||||
.base = 0, .len = 0x494,
|
||||
.features = BIT(DPU_MDP_PERIPH_0_REMOVED),
|
||||
.clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x4330, .bit_off = 0 },
|
||||
|
||||
@@ -101,11 +101,6 @@ enum dpu_hw_blk_type {
|
||||
DPU_HW_BLK_MAX,
|
||||
};
|
||||
|
||||
enum dpu_mdp {
|
||||
MDP_TOP = 0x1,
|
||||
MDP_MAX,
|
||||
};
|
||||
|
||||
enum dpu_sspp {
|
||||
SSPP_NONE,
|
||||
SSPP_VIG0,
|
||||
|
||||
@@ -287,7 +287,6 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(const struct dpu_mdp_cfg *cfg,
|
||||
/*
|
||||
* Assign ops
|
||||
*/
|
||||
mdp->idx = cfg->id;
|
||||
mdp->caps = cfg;
|
||||
_setup_mdp_ops(&mdp->ops, mdp->caps->features);
|
||||
|
||||
|
||||
@@ -137,7 +137,6 @@ struct dpu_hw_mdp {
|
||||
struct dpu_hw_blk_reg_map hw;
|
||||
|
||||
/* top */
|
||||
enum dpu_mdp idx;
|
||||
const struct dpu_mdp_cfg *caps;
|
||||
|
||||
/* ops */
|
||||
|
||||
Reference in New Issue
Block a user