Skip to content

Commit f7bf131

Browse files
quic-kdybciolumag
quic-kdybcio
authored and
lumag
committed
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: e3b1f36 ("drm/msm/dpu: Add X1E80100 support") Fixes: 4a352c2 ("drm/msm/dpu: Introduce SC8280XP") Fixes: efcd010 ("drm/msm/dpu: add support for SM8550") Fixes: 100d7ef ("drm/msm/dpu: add support for SM8450") Fixes: 1785751 ("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>
1 parent a9dece6 commit f7bf131

5 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,46 +133,46 @@ static const struct dpu_sspp_cfg sc8280xp_sspp[] = {
133133
static const struct dpu_lm_cfg sc8280xp_lm[] = {
134134
{
135135
.name = "lm_0", .id = LM_0,
136-
.base = 0x44000, .len = 0x320,
136+
.base = 0x44000, .len = 0x400,
137137
.features = MIXER_MSM8998_MASK,
138138
.sblk = &sdm845_lm_sblk,
139139
.lm_pair = LM_1,
140140
.pingpong = PINGPONG_0,
141141
.dspp = DSPP_0,
142142
}, {
143143
.name = "lm_1", .id = LM_1,
144-
.base = 0x45000, .len = 0x320,
144+
.base = 0x45000, .len = 0x400,
145145
.features = MIXER_MSM8998_MASK,
146146
.sblk = &sdm845_lm_sblk,
147147
.lm_pair = LM_0,
148148
.pingpong = PINGPONG_1,
149149
.dspp = DSPP_1,
150150
}, {
151151
.name = "lm_2", .id = LM_2,
152-
.base = 0x46000, .len = 0x320,
152+
.base = 0x46000, .len = 0x400,
153153
.features = MIXER_MSM8998_MASK,
154154
.sblk = &sdm845_lm_sblk,
155155
.lm_pair = LM_3,
156156
.pingpong = PINGPONG_2,
157157
.dspp = DSPP_2,
158158
}, {
159159
.name = "lm_3", .id = LM_3,
160-
.base = 0x47000, .len = 0x320,
160+
.base = 0x47000, .len = 0x400,
161161
.features = MIXER_MSM8998_MASK,
162162
.sblk = &sdm845_lm_sblk,
163163
.lm_pair = LM_2,
164164
.pingpong = PINGPONG_3,
165165
.dspp = DSPP_3,
166166
}, {
167167
.name = "lm_4", .id = LM_4,
168-
.base = 0x48000, .len = 0x320,
168+
.base = 0x48000, .len = 0x400,
169169
.features = MIXER_MSM8998_MASK,
170170
.sblk = &sdm845_lm_sblk,
171171
.lm_pair = LM_5,
172172
.pingpong = PINGPONG_4,
173173
}, {
174174
.name = "lm_5", .id = LM_5,
175-
.base = 0x49000, .len = 0x320,
175+
.base = 0x49000, .len = 0x400,
176176
.features = MIXER_MSM8998_MASK,
177177
.sblk = &sdm845_lm_sblk,
178178
.lm_pair = LM_4,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,46 +134,46 @@ static const struct dpu_sspp_cfg sm8450_sspp[] = {
134134
static const struct dpu_lm_cfg sm8450_lm[] = {
135135
{
136136
.name = "lm_0", .id = LM_0,
137-
.base = 0x44000, .len = 0x320,
137+
.base = 0x44000, .len = 0x400,
138138
.features = MIXER_MSM8998_MASK,
139139
.sblk = &sdm845_lm_sblk,
140140
.lm_pair = LM_1,
141141
.pingpong = PINGPONG_0,
142142
.dspp = DSPP_0,
143143
}, {
144144
.name = "lm_1", .id = LM_1,
145-
.base = 0x45000, .len = 0x320,
145+
.base = 0x45000, .len = 0x400,
146146
.features = MIXER_MSM8998_MASK,
147147
.sblk = &sdm845_lm_sblk,
148148
.lm_pair = LM_0,
149149
.pingpong = PINGPONG_1,
150150
.dspp = DSPP_1,
151151
}, {
152152
.name = "lm_2", .id = LM_2,
153-
.base = 0x46000, .len = 0x320,
153+
.base = 0x46000, .len = 0x400,
154154
.features = MIXER_MSM8998_MASK,
155155
.sblk = &sdm845_lm_sblk,
156156
.lm_pair = LM_3,
157157
.pingpong = PINGPONG_2,
158158
.dspp = DSPP_2,
159159
}, {
160160
.name = "lm_3", .id = LM_3,
161-
.base = 0x47000, .len = 0x320,
161+
.base = 0x47000, .len = 0x400,
162162
.features = MIXER_MSM8998_MASK,
163163
.sblk = &sdm845_lm_sblk,
164164
.lm_pair = LM_2,
165165
.pingpong = PINGPONG_3,
166166
.dspp = DSPP_3,
167167
}, {
168168
.name = "lm_4", .id = LM_4,
169-
.base = 0x48000, .len = 0x320,
169+
.base = 0x48000, .len = 0x400,
170170
.features = MIXER_MSM8998_MASK,
171171
.sblk = &sdm845_lm_sblk,
172172
.lm_pair = LM_5,
173173
.pingpong = PINGPONG_4,
174174
}, {
175175
.name = "lm_5", .id = LM_5,
176-
.base = 0x49000, .len = 0x320,
176+
.base = 0x49000, .len = 0x400,
177177
.features = MIXER_MSM8998_MASK,
178178
.sblk = &sdm845_lm_sblk,
179179
.lm_pair = LM_4,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,46 +131,46 @@ static const struct dpu_sspp_cfg sm8550_sspp[] = {
131131
static const struct dpu_lm_cfg sm8550_lm[] = {
132132
{
133133
.name = "lm_0", .id = LM_0,
134-
.base = 0x44000, .len = 0x320,
134+
.base = 0x44000, .len = 0x400,
135135
.features = MIXER_MSM8998_MASK,
136136
.sblk = &sdm845_lm_sblk,
137137
.lm_pair = LM_1,
138138
.pingpong = PINGPONG_0,
139139
.dspp = DSPP_0,
140140
}, {
141141
.name = "lm_1", .id = LM_1,
142-
.base = 0x45000, .len = 0x320,
142+
.base = 0x45000, .len = 0x400,
143143
.features = MIXER_MSM8998_MASK,
144144
.sblk = &sdm845_lm_sblk,
145145
.lm_pair = LM_0,
146146
.pingpong = PINGPONG_1,
147147
.dspp = DSPP_1,
148148
}, {
149149
.name = "lm_2", .id = LM_2,
150-
.base = 0x46000, .len = 0x320,
150+
.base = 0x46000, .len = 0x400,
151151
.features = MIXER_MSM8998_MASK,
152152
.sblk = &sdm845_lm_sblk,
153153
.lm_pair = LM_3,
154154
.pingpong = PINGPONG_2,
155155
.dspp = DSPP_2,
156156
}, {
157157
.name = "lm_3", .id = LM_3,
158-
.base = 0x47000, .len = 0x320,
158+
.base = 0x47000, .len = 0x400,
159159
.features = MIXER_MSM8998_MASK,
160160
.sblk = &sdm845_lm_sblk,
161161
.lm_pair = LM_2,
162162
.pingpong = PINGPONG_3,
163163
.dspp = DSPP_3,
164164
}, {
165165
.name = "lm_4", .id = LM_4,
166-
.base = 0x48000, .len = 0x320,
166+
.base = 0x48000, .len = 0x400,
167167
.features = MIXER_MSM8998_MASK,
168168
.sblk = &sdm845_lm_sblk,
169169
.lm_pair = LM_5,
170170
.pingpong = PINGPONG_4,
171171
}, {
172172
.name = "lm_5", .id = LM_5,
173-
.base = 0x49000, .len = 0x320,
173+
.base = 0x49000, .len = 0x400,
174174
.features = MIXER_MSM8998_MASK,
175175
.sblk = &sdm845_lm_sblk,
176176
.lm_pair = LM_4,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,46 +131,46 @@ static const struct dpu_sspp_cfg sar2130p_sspp[] = {
131131
static const struct dpu_lm_cfg sar2130p_lm[] = {
132132
{
133133
.name = "lm_0", .id = LM_0,
134-
.base = 0x44000, .len = 0x320,
134+
.base = 0x44000, .len = 0x400,
135135
.features = MIXER_MSM8998_MASK,
136136
.sblk = &sdm845_lm_sblk,
137137
.lm_pair = LM_1,
138138
.pingpong = PINGPONG_0,
139139
.dspp = DSPP_0,
140140
}, {
141141
.name = "lm_1", .id = LM_1,
142-
.base = 0x45000, .len = 0x320,
142+
.base = 0x45000, .len = 0x400,
143143
.features = MIXER_MSM8998_MASK,
144144
.sblk = &sdm845_lm_sblk,
145145
.lm_pair = LM_0,
146146
.pingpong = PINGPONG_1,
147147
.dspp = DSPP_1,
148148
}, {
149149
.name = "lm_2", .id = LM_2,
150-
.base = 0x46000, .len = 0x320,
150+
.base = 0x46000, .len = 0x400,
151151
.features = MIXER_MSM8998_MASK,
152152
.sblk = &sdm845_lm_sblk,
153153
.lm_pair = LM_3,
154154
.pingpong = PINGPONG_2,
155155
.dspp = DSPP_2,
156156
}, {
157157
.name = "lm_3", .id = LM_3,
158-
.base = 0x47000, .len = 0x320,
158+
.base = 0x47000, .len = 0x400,
159159
.features = MIXER_MSM8998_MASK,
160160
.sblk = &sdm845_lm_sblk,
161161
.lm_pair = LM_2,
162162
.pingpong = PINGPONG_3,
163163
.dspp = DSPP_3,
164164
}, {
165165
.name = "lm_4", .id = LM_4,
166-
.base = 0x48000, .len = 0x320,
166+
.base = 0x48000, .len = 0x400,
167167
.features = MIXER_MSM8998_MASK,
168168
.sblk = &sdm845_lm_sblk,
169169
.lm_pair = LM_5,
170170
.pingpong = PINGPONG_4,
171171
}, {
172172
.name = "lm_5", .id = LM_5,
173-
.base = 0x49000, .len = 0x320,
173+
.base = 0x49000, .len = 0x400,
174174
.features = MIXER_MSM8998_MASK,
175175
.sblk = &sdm845_lm_sblk,
176176
.lm_pair = LM_4,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,46 +130,46 @@ static const struct dpu_sspp_cfg x1e80100_sspp[] = {
130130
static const struct dpu_lm_cfg x1e80100_lm[] = {
131131
{
132132
.name = "lm_0", .id = LM_0,
133-
.base = 0x44000, .len = 0x320,
133+
.base = 0x44000, .len = 0x400,
134134
.features = MIXER_MSM8998_MASK,
135135
.sblk = &sdm845_lm_sblk,
136136
.lm_pair = LM_1,
137137
.pingpong = PINGPONG_0,
138138
.dspp = DSPP_0,
139139
}, {
140140
.name = "lm_1", .id = LM_1,
141-
.base = 0x45000, .len = 0x320,
141+
.base = 0x45000, .len = 0x400,
142142
.features = MIXER_MSM8998_MASK,
143143
.sblk = &sdm845_lm_sblk,
144144
.lm_pair = LM_0,
145145
.pingpong = PINGPONG_1,
146146
.dspp = DSPP_1,
147147
}, {
148148
.name = "lm_2", .id = LM_2,
149-
.base = 0x46000, .len = 0x320,
149+
.base = 0x46000, .len = 0x400,
150150
.features = MIXER_MSM8998_MASK,
151151
.sblk = &sdm845_lm_sblk,
152152
.lm_pair = LM_3,
153153
.pingpong = PINGPONG_2,
154154
.dspp = DSPP_2,
155155
}, {
156156
.name = "lm_3", .id = LM_3,
157-
.base = 0x47000, .len = 0x320,
157+
.base = 0x47000, .len = 0x400,
158158
.features = MIXER_MSM8998_MASK,
159159
.sblk = &sdm845_lm_sblk,
160160
.lm_pair = LM_2,
161161
.pingpong = PINGPONG_3,
162162
.dspp = DSPP_3,
163163
}, {
164164
.name = "lm_4", .id = LM_4,
165-
.base = 0x48000, .len = 0x320,
165+
.base = 0x48000, .len = 0x400,
166166
.features = MIXER_MSM8998_MASK,
167167
.sblk = &sdm845_lm_sblk,
168168
.lm_pair = LM_5,
169169
.pingpong = PINGPONG_4,
170170
}, {
171171
.name = "lm_5", .id = LM_5,
172-
.base = 0x49000, .len = 0x320,
172+
.base = 0x49000, .len = 0x400,
173173
.features = MIXER_MSM8998_MASK,
174174
.sblk = &sdm845_lm_sblk,
175175
.lm_pair = LM_4,

0 commit comments

Comments
 (0)