Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dpu: Fix LM size on a number of platforms
The register space has grown with what seems to be DPU8.
Bump up the .len to match.
Fixes: e3b1f369db5a ("drm/msm/dpu: Add X1E80100 support")
Fixes: 4a352c2fc15a ("drm/msm/dpu: Introduce SC8280XP")
Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550")
Fixes: 100d7ef6995d ("drm/msm/dpu: add support for SM8450")
Fixes: 178575173472 ("drm/msm/dpu: add catalog entry for SAR2130P")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/701063/
Link: https://lore.kernel.org/r/20260127-topic-lm_size_fix-v1-1-25f88d014dfd@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
authored by
Konrad Dybcio
and committed by
Dmitry Baryshkov
f7bf1319
a9dece60
+30
-30
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
···
133
133
static const struct dpu_lm_cfg sc8280xp_lm[] = {
134
134
{
135
135
.name = "lm_0", .id = LM_0,
136
-
.base = 0x44000, .len = 0x320,
136
+
.base = 0x44000, .len = 0x400,
137
137
.features = MIXER_MSM8998_MASK,
138
138
.sblk = &sdm845_lm_sblk,
139
139
.lm_pair = LM_1,
···
141
141
.dspp = DSPP_0,
142
142
}, {
143
143
.name = "lm_1", .id = LM_1,
144
-
.base = 0x45000, .len = 0x320,
144
+
.base = 0x45000, .len = 0x400,
145
145
.features = MIXER_MSM8998_MASK,
146
146
.sblk = &sdm845_lm_sblk,
147
147
.lm_pair = LM_0,
···
149
149
.dspp = DSPP_1,
150
150
}, {
151
151
.name = "lm_2", .id = LM_2,
152
-
.base = 0x46000, .len = 0x320,
152
+
.base = 0x46000, .len = 0x400,
153
153
.features = MIXER_MSM8998_MASK,
154
154
.sblk = &sdm845_lm_sblk,
155
155
.lm_pair = LM_3,
···
157
157
.dspp = DSPP_2,
158
158
}, {
159
159
.name = "lm_3", .id = LM_3,
160
-
.base = 0x47000, .len = 0x320,
160
+
.base = 0x47000, .len = 0x400,
161
161
.features = MIXER_MSM8998_MASK,
162
162
.sblk = &sdm845_lm_sblk,
163
163
.lm_pair = LM_2,
···
165
165
.dspp = DSPP_3,
166
166
}, {
167
167
.name = "lm_4", .id = LM_4,
168
-
.base = 0x48000, .len = 0x320,
168
+
.base = 0x48000, .len = 0x400,
169
169
.features = MIXER_MSM8998_MASK,
170
170
.sblk = &sdm845_lm_sblk,
171
171
.lm_pair = LM_5,
172
172
.pingpong = PINGPONG_4,
173
173
}, {
174
174
.name = "lm_5", .id = LM_5,
175
-
.base = 0x49000, .len = 0x320,
175
+
.base = 0x49000, .len = 0x400,
176
176
.features = MIXER_MSM8998_MASK,
177
177
.sblk = &sdm845_lm_sblk,
178
178
.lm_pair = LM_4,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
···
134
134
static const struct dpu_lm_cfg sm8450_lm[] = {
135
135
{
136
136
.name = "lm_0", .id = LM_0,
137
-
.base = 0x44000, .len = 0x320,
137
+
.base = 0x44000, .len = 0x400,
138
138
.features = MIXER_MSM8998_MASK,
139
139
.sblk = &sdm845_lm_sblk,
140
140
.lm_pair = LM_1,
···
142
142
.dspp = DSPP_0,
143
143
}, {
144
144
.name = "lm_1", .id = LM_1,
145
-
.base = 0x45000, .len = 0x320,
145
+
.base = 0x45000, .len = 0x400,
146
146
.features = MIXER_MSM8998_MASK,
147
147
.sblk = &sdm845_lm_sblk,
148
148
.lm_pair = LM_0,
···
150
150
.dspp = DSPP_1,
151
151
}, {
152
152
.name = "lm_2", .id = LM_2,
153
-
.base = 0x46000, .len = 0x320,
153
+
.base = 0x46000, .len = 0x400,
154
154
.features = MIXER_MSM8998_MASK,
155
155
.sblk = &sdm845_lm_sblk,
156
156
.lm_pair = LM_3,
···
158
158
.dspp = DSPP_2,
159
159
}, {
160
160
.name = "lm_3", .id = LM_3,
161
-
.base = 0x47000, .len = 0x320,
161
+
.base = 0x47000, .len = 0x400,
162
162
.features = MIXER_MSM8998_MASK,
163
163
.sblk = &sdm845_lm_sblk,
164
164
.lm_pair = LM_2,
···
166
166
.dspp = DSPP_3,
167
167
}, {
168
168
.name = "lm_4", .id = LM_4,
169
-
.base = 0x48000, .len = 0x320,
169
+
.base = 0x48000, .len = 0x400,
170
170
.features = MIXER_MSM8998_MASK,
171
171
.sblk = &sdm845_lm_sblk,
172
172
.lm_pair = LM_5,
173
173
.pingpong = PINGPONG_4,
174
174
}, {
175
175
.name = "lm_5", .id = LM_5,
176
-
.base = 0x49000, .len = 0x320,
176
+
.base = 0x49000, .len = 0x400,
177
177
.features = MIXER_MSM8998_MASK,
178
178
.sblk = &sdm845_lm_sblk,
179
179
.lm_pair = LM_4,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
···
131
131
static const struct dpu_lm_cfg sm8550_lm[] = {
132
132
{
133
133
.name = "lm_0", .id = LM_0,
134
-
.base = 0x44000, .len = 0x320,
134
+
.base = 0x44000, .len = 0x400,
135
135
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_1,
···
139
139
.dspp = DSPP_0,
140
140
}, {
141
141
.name = "lm_1", .id = LM_1,
142
-
.base = 0x45000, .len = 0x320,
142
+
.base = 0x45000, .len = 0x400,
143
143
.features = MIXER_MSM8998_MASK,
144
144
.sblk = &sdm845_lm_sblk,
145
145
.lm_pair = LM_0,
···
147
147
.dspp = DSPP_1,
148
148
}, {
149
149
.name = "lm_2", .id = LM_2,
150
-
.base = 0x46000, .len = 0x320,
150
+
.base = 0x46000, .len = 0x400,
151
151
.features = MIXER_MSM8998_MASK,
152
152
.sblk = &sdm845_lm_sblk,
153
153
.lm_pair = LM_3,
···
155
155
.dspp = DSPP_2,
156
156
}, {
157
157
.name = "lm_3", .id = LM_3,
158
-
.base = 0x47000, .len = 0x320,
158
+
.base = 0x47000, .len = 0x400,
159
159
.features = MIXER_MSM8998_MASK,
160
160
.sblk = &sdm845_lm_sblk,
161
161
.lm_pair = LM_2,
···
163
163
.dspp = DSPP_3,
164
164
}, {
165
165
.name = "lm_4", .id = LM_4,
166
-
.base = 0x48000, .len = 0x320,
166
+
.base = 0x48000, .len = 0x400,
167
167
.features = MIXER_MSM8998_MASK,
168
168
.sblk = &sdm845_lm_sblk,
169
169
.lm_pair = LM_5,
170
170
.pingpong = PINGPONG_4,
171
171
}, {
172
172
.name = "lm_5", .id = LM_5,
173
-
.base = 0x49000, .len = 0x320,
173
+
.base = 0x49000, .len = 0x400,
174
174
.features = MIXER_MSM8998_MASK,
175
175
.sblk = &sdm845_lm_sblk,
176
176
.lm_pair = LM_4,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
···
131
131
static const struct dpu_lm_cfg sar2130p_lm[] = {
132
132
{
133
133
.name = "lm_0", .id = LM_0,
134
-
.base = 0x44000, .len = 0x320,
134
+
.base = 0x44000, .len = 0x400,
135
135
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_1,
···
139
139
.dspp = DSPP_0,
140
140
}, {
141
141
.name = "lm_1", .id = LM_1,
142
-
.base = 0x45000, .len = 0x320,
142
+
.base = 0x45000, .len = 0x400,
143
143
.features = MIXER_MSM8998_MASK,
144
144
.sblk = &sdm845_lm_sblk,
145
145
.lm_pair = LM_0,
···
147
147
.dspp = DSPP_1,
148
148
}, {
149
149
.name = "lm_2", .id = LM_2,
150
-
.base = 0x46000, .len = 0x320,
150
+
.base = 0x46000, .len = 0x400,
151
151
.features = MIXER_MSM8998_MASK,
152
152
.sblk = &sdm845_lm_sblk,
153
153
.lm_pair = LM_3,
···
155
155
.dspp = DSPP_2,
156
156
}, {
157
157
.name = "lm_3", .id = LM_3,
158
-
.base = 0x47000, .len = 0x320,
158
+
.base = 0x47000, .len = 0x400,
159
159
.features = MIXER_MSM8998_MASK,
160
160
.sblk = &sdm845_lm_sblk,
161
161
.lm_pair = LM_2,
···
163
163
.dspp = DSPP_3,
164
164
}, {
165
165
.name = "lm_4", .id = LM_4,
166
-
.base = 0x48000, .len = 0x320,
166
+
.base = 0x48000, .len = 0x400,
167
167
.features = MIXER_MSM8998_MASK,
168
168
.sblk = &sdm845_lm_sblk,
169
169
.lm_pair = LM_5,
170
170
.pingpong = PINGPONG_4,
171
171
}, {
172
172
.name = "lm_5", .id = LM_5,
173
-
.base = 0x49000, .len = 0x320,
173
+
.base = 0x49000, .len = 0x400,
174
174
.features = MIXER_MSM8998_MASK,
175
175
.sblk = &sdm845_lm_sblk,
176
176
.lm_pair = LM_4,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
···
130
130
static const struct dpu_lm_cfg x1e80100_lm[] = {
131
131
{
132
132
.name = "lm_0", .id = LM_0,
133
-
.base = 0x44000, .len = 0x320,
133
+
.base = 0x44000, .len = 0x400,
134
134
.features = MIXER_MSM8998_MASK,
135
135
.sblk = &sdm845_lm_sblk,
136
136
.lm_pair = LM_1,
···
138
138
.dspp = DSPP_0,
139
139
}, {
140
140
.name = "lm_1", .id = LM_1,
141
-
.base = 0x45000, .len = 0x320,
141
+
.base = 0x45000, .len = 0x400,
142
142
.features = MIXER_MSM8998_MASK,
143
143
.sblk = &sdm845_lm_sblk,
144
144
.lm_pair = LM_0,
···
146
146
.dspp = DSPP_1,
147
147
}, {
148
148
.name = "lm_2", .id = LM_2,
149
-
.base = 0x46000, .len = 0x320,
149
+
.base = 0x46000, .len = 0x400,
150
150
.features = MIXER_MSM8998_MASK,
151
151
.sblk = &sdm845_lm_sblk,
152
152
.lm_pair = LM_3,
···
154
154
.dspp = DSPP_2,
155
155
}, {
156
156
.name = "lm_3", .id = LM_3,
157
-
.base = 0x47000, .len = 0x320,
157
+
.base = 0x47000, .len = 0x400,
158
158
.features = MIXER_MSM8998_MASK,
159
159
.sblk = &sdm845_lm_sblk,
160
160
.lm_pair = LM_2,
···
162
162
.dspp = DSPP_3,
163
163
}, {
164
164
.name = "lm_4", .id = LM_4,
165
-
.base = 0x48000, .len = 0x320,
165
+
.base = 0x48000, .len = 0x400,
166
166
.features = MIXER_MSM8998_MASK,
167
167
.sblk = &sdm845_lm_sblk,
168
168
.lm_pair = LM_5,
169
169
.pingpong = PINGPONG_4,
170
170
}, {
171
171
.name = "lm_5", .id = LM_5,
172
-
.base = 0x49000, .len = 0x320,
172
+
.base = 0x49000, .len = 0x400,
173
173
.features = MIXER_MSM8998_MASK,
174
174
.sblk = &sdm845_lm_sblk,
175
175
.lm_pair = LM_4,