Skip to content

Commit dac76a0

Browse files
committed
drm/msm/dpu: fetch DPU configuration from match data
In email discussion it was noted that there can be different SoC device having slightly different SoC features, but sharing the same DPU hw revision. Stop fetching catalog data using core_rev and use platform's match data instead. Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/530891/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent e5edf65 commit dac76a0

17 files changed

+46
-83
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static const struct dpu_perf_cfg msm8998_perf_data = {
176176
.bw_inefficiency_factor = 120,
177177
};
178178

179-
static const struct dpu_mdss_cfg msm8998_dpu_cfg = {
179+
const struct dpu_mdss_cfg dpu_msm8998_cfg = {
180180
.caps = &msm8998_dpu_caps,
181181
.ubwc = &msm8998_ubwc_cfg,
182182
.mdp_count = ARRAY_SIZE(msm8998_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static const struct dpu_perf_cfg sdm845_perf_data = {
174174
.bw_inefficiency_factor = 120,
175175
};
176176

177-
static const struct dpu_mdss_cfg sdm845_dpu_cfg = {
177+
const struct dpu_mdss_cfg dpu_sdm845_cfg = {
178178
.caps = &sdm845_dpu_caps,
179179
.ubwc = &sdm845_ubwc_cfg,
180180
.mdp_count = ARRAY_SIZE(sdm845_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static const struct dpu_perf_cfg sm8150_perf_data = {
197197
.bw_inefficiency_factor = 120,
198198
};
199199

200-
static const struct dpu_mdss_cfg sm8150_dpu_cfg = {
200+
const struct dpu_mdss_cfg dpu_sm8150_cfg = {
201201
.caps = &sm8150_dpu_caps,
202202
.ubwc = &sm8150_ubwc_cfg,
203203
.mdp_count = ARRAY_SIZE(sm8150_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static const struct dpu_perf_cfg sc8180x_perf_data = {
179179
.bw_inefficiency_factor = 120,
180180
};
181181

182-
static const struct dpu_mdss_cfg sc8180x_dpu_cfg = {
182+
const struct dpu_mdss_cfg dpu_sc8180x_cfg = {
183183
.caps = &sc8180x_dpu_caps,
184184
.ubwc = &sc8180x_ubwc_cfg,
185185
.mdp_count = ARRAY_SIZE(sc8180x_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static const struct dpu_perf_cfg sm8250_perf_data = {
203203
.bw_inefficiency_factor = 120,
204204
};
205205

206-
static const struct dpu_mdss_cfg sm8250_dpu_cfg = {
206+
const struct dpu_mdss_cfg dpu_sm8250_cfg = {
207207
.caps = &sm8250_dpu_caps,
208208
.ubwc = &sm8250_ubwc_cfg,
209209
.mdp_count = ARRAY_SIZE(sm8250_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static const struct dpu_perf_cfg sc7180_perf_data = {
122122
.bw_inefficiency_factor = 120,
123123
};
124124

125-
static const struct dpu_mdss_cfg sc7180_dpu_cfg = {
125+
const struct dpu_mdss_cfg dpu_sc7180_cfg = {
126126
.caps = &sc7180_dpu_caps,
127127
.ubwc = &sc7180_ubwc_cfg,
128128
.mdp_count = ARRAY_SIZE(sc7180_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static const struct dpu_perf_cfg sm6115_perf_data = {
9999
.bw_inefficiency_factor = 120,
100100
};
101101

102-
static const struct dpu_mdss_cfg sm6115_dpu_cfg = {
102+
const struct dpu_mdss_cfg dpu_sm6115_cfg = {
103103
.caps = &sm6115_dpu_caps,
104104
.ubwc = &sm6115_ubwc_cfg,
105105
.mdp_count = ARRAY_SIZE(sm6115_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static const struct dpu_perf_cfg qcm2290_perf_data = {
8989
.bw_inefficiency_factor = 120,
9090
};
9191

92-
static const struct dpu_mdss_cfg qcm2290_dpu_cfg = {
92+
const struct dpu_mdss_cfg dpu_qcm2290_cfg = {
9393
.caps = &qcm2290_dpu_caps,
9494
.ubwc = &qcm2290_ubwc_cfg,
9595
.mdp_count = ARRAY_SIZE(qcm2290_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static const struct dpu_perf_cfg sm8350_perf_data = {
190190
.bw_inefficiency_factor = 120,
191191
};
192192

193-
static const struct dpu_mdss_cfg sm8350_dpu_cfg = {
193+
const struct dpu_mdss_cfg dpu_sm8350_cfg = {
194194
.caps = &sm8350_dpu_caps,
195195
.ubwc = &sm8350_ubwc_cfg,
196196
.mdp_count = ARRAY_SIZE(sm8350_mdp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static const struct dpu_perf_cfg sc7280_perf_data = {
127127
.bw_inefficiency_factor = 120,
128128
};
129129

130-
static const struct dpu_mdss_cfg sc7280_dpu_cfg = {
130+
const struct dpu_mdss_cfg dpu_sc7280_cfg = {
131131
.caps = &sc7280_dpu_caps,
132132
.ubwc = &sc7280_ubwc_cfg,
133133
.mdp_count = ARRAY_SIZE(sc7280_mdp),

0 commit comments

Comments
 (0)