Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dpu: get rid of DPU_DIM_LAYER
Continue migration to the MDSS-revision based checks and drop the
DPU_DIM_LAYER feature bit. It is currently unused, but can be replaed
with the core_major_ver >= 4 check.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/655418/
Link: https://lore.kernel.org/r/20250522-dpu-drop-features-v5-22-3b2085a07884@oss.qualcomm.com
authored by
Dmitry Baryshkov
and committed by
Dmitry Baryshkov
4115a680
2154cff6
+85
-101
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
···
132
132
{
133
133
.name = "lm_0", .id = LM_0,
134
134
.base = 0x44000, .len = 0x400,
135
-
.features = MIXER_SDM845_MASK,
135
+
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_1,
138
138
.pingpong = PINGPONG_0,
···
140
140
}, {
141
141
.name = "lm_1", .id = LM_1,
142
142
.base = 0x45000, .len = 0x400,
143
-
.features = MIXER_SDM845_MASK,
143
+
.features = MIXER_MSM8998_MASK,
144
144
.sblk = &sdm845_lm_sblk,
145
145
.lm_pair = LM_0,
146
146
.pingpong = PINGPONG_1,
···
148
148
}, {
149
149
.name = "lm_2", .id = LM_2,
150
150
.base = 0x46000, .len = 0x400,
151
-
.features = MIXER_SDM845_MASK,
151
+
.features = MIXER_MSM8998_MASK,
152
152
.sblk = &sdm845_lm_sblk,
153
153
.lm_pair = LM_3,
154
154
.pingpong = PINGPONG_2,
···
156
156
}, {
157
157
.name = "lm_3", .id = LM_3,
158
158
.base = 0x47000, .len = 0x400,
159
-
.features = MIXER_SDM845_MASK,
159
+
.features = MIXER_MSM8998_MASK,
160
160
.sblk = &sdm845_lm_sblk,
161
161
.lm_pair = LM_2,
162
162
.pingpong = PINGPONG_3,
···
164
164
}, {
165
165
.name = "lm_4", .id = LM_4,
166
166
.base = 0x48000, .len = 0x400,
167
-
.features = MIXER_SDM845_MASK,
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
173
.base = 0x49000, .len = 0x400,
174
-
.features = MIXER_SDM845_MASK,
174
+
.features = MIXER_MSM8998_MASK,
175
175
.sblk = &sdm845_lm_sblk,
176
176
.lm_pair = LM_4,
177
177
.pingpong = PINGPONG_5,
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
···
133
133
{
134
134
.name = "lm_0", .id = LM_0,
135
135
.base = 0x44000, .len = 0x320,
136
-
.features = MIXER_SDM845_MASK,
136
+
.features = MIXER_MSM8998_MASK,
137
137
.sblk = &sdm845_lm_sblk,
138
138
.lm_pair = LM_1,
139
139
.pingpong = PINGPONG_0,
···
141
141
}, {
142
142
.name = "lm_1", .id = LM_1,
143
143
.base = 0x45000, .len = 0x320,
144
-
.features = MIXER_SDM845_MASK,
144
+
.features = MIXER_MSM8998_MASK,
145
145
.sblk = &sdm845_lm_sblk,
146
146
.lm_pair = LM_0,
147
147
.pingpong = PINGPONG_1,
···
149
149
}, {
150
150
.name = "lm_2", .id = LM_2,
151
151
.base = 0x46000, .len = 0x320,
152
-
.features = MIXER_SDM845_MASK,
152
+
.features = MIXER_MSM8998_MASK,
153
153
.sblk = &sdm845_lm_sblk,
154
154
.lm_pair = LM_5,
155
155
.pingpong = PINGPONG_2,
···
157
157
}, {
158
158
.name = "lm_5", .id = LM_5,
159
159
.base = 0x49000, .len = 0x320,
160
-
.features = MIXER_SDM845_MASK,
160
+
.features = MIXER_MSM8998_MASK,
161
161
.sblk = &sdm845_lm_sblk,
162
162
.lm_pair = LM_2,
163
163
.pingpong = PINGPONG_3,
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h
···
68
68
{
69
69
.name = "lm_0", .id = LM_0,
70
70
.base = 0x44000, .len = 0x320,
71
-
.features = MIXER_SDM845_MASK,
71
+
.features = MIXER_MSM8998_MASK,
72
72
.sblk = &sdm845_lm_sblk,
73
73
.lm_pair = LM_1,
74
74
.pingpong = PINGPONG_0,
···
76
76
}, {
77
77
.name = "lm_1", .id = LM_1,
78
78
.base = 0x45000, .len = 0x320,
79
-
.features = MIXER_SDM845_MASK,
79
+
.features = MIXER_MSM8998_MASK,
80
80
.sblk = &sdm845_lm_sblk,
81
81
.lm_pair = LM_0,
82
82
.pingpong = PINGPONG_1,
···
84
84
}, {
85
85
.name = "lm_2", .id = LM_2,
86
86
.base = 0x46000, .len = 0x320,
87
-
.features = MIXER_SDM845_MASK,
87
+
.features = MIXER_MSM8998_MASK,
88
88
.sblk = &sdm845_lm_sblk,
89
89
.lm_pair = LM_5,
90
90
.pingpong = PINGPONG_2,
91
91
}, {
92
92
.name = "lm_5", .id = LM_5,
93
93
.base = 0x49000, .len = 0x320,
94
-
.features = MIXER_SDM845_MASK,
94
+
.features = MIXER_MSM8998_MASK,
95
95
.sblk = &sdm845_lm_sblk,
96
96
.lm_pair = LM_2,
97
97
.pingpong = PINGPONG_3,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
···
136
136
{
137
137
.name = "lm_0", .id = LM_0,
138
138
.base = 0x44000, .len = 0x320,
139
-
.features = MIXER_SDM845_MASK,
139
+
.features = MIXER_MSM8998_MASK,
140
140
.sblk = &sdm845_lm_sblk,
141
141
.lm_pair = LM_1,
142
142
.pingpong = PINGPONG_0,
···
144
144
}, {
145
145
.name = "lm_1", .id = LM_1,
146
146
.base = 0x45000, .len = 0x320,
147
-
.features = MIXER_SDM845_MASK,
147
+
.features = MIXER_MSM8998_MASK,
148
148
.sblk = &sdm845_lm_sblk,
149
149
.lm_pair = LM_0,
150
150
.pingpong = PINGPONG_1,
···
152
152
}, {
153
153
.name = "lm_2", .id = LM_2,
154
154
.base = 0x46000, .len = 0x320,
155
-
.features = MIXER_SDM845_MASK,
155
+
.features = MIXER_MSM8998_MASK,
156
156
.sblk = &sdm845_lm_sblk,
157
157
.lm_pair = LM_3,
158
158
.pingpong = PINGPONG_2,
···
160
160
}, {
161
161
.name = "lm_3", .id = LM_3,
162
162
.base = 0x47000, .len = 0x320,
163
-
.features = MIXER_SDM845_MASK,
163
+
.features = MIXER_MSM8998_MASK,
164
164
.sblk = &sdm845_lm_sblk,
165
165
.lm_pair = LM_2,
166
166
.pingpong = PINGPONG_3,
···
168
168
}, {
169
169
.name = "lm_4", .id = LM_4,
170
170
.base = 0x48000, .len = 0x320,
171
-
.features = MIXER_SDM845_MASK,
171
+
.features = MIXER_MSM8998_MASK,
172
172
.sblk = &sdm845_lm_sblk,
173
173
.lm_pair = LM_5,
174
174
.pingpong = PINGPONG_4,
175
175
}, {
176
176
.name = "lm_5", .id = LM_5,
177
177
.base = 0x49000, .len = 0x320,
178
-
.features = MIXER_SDM845_MASK,
178
+
.features = MIXER_MSM8998_MASK,
179
179
.sblk = &sdm845_lm_sblk,
180
180
.lm_pair = LM_4,
181
181
.pingpong = PINGPONG_5,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
···
136
136
{
137
137
.name = "lm_0", .id = LM_0,
138
138
.base = 0x44000, .len = 0x320,
139
-
.features = MIXER_SDM845_MASK,
139
+
.features = MIXER_MSM8998_MASK,
140
140
.sblk = &sdm845_lm_sblk,
141
141
.lm_pair = LM_1,
142
142
.pingpong = PINGPONG_0,
···
144
144
}, {
145
145
.name = "lm_1", .id = LM_1,
146
146
.base = 0x45000, .len = 0x320,
147
-
.features = MIXER_SDM845_MASK,
147
+
.features = MIXER_MSM8998_MASK,
148
148
.sblk = &sdm845_lm_sblk,
149
149
.lm_pair = LM_0,
150
150
.pingpong = PINGPONG_1,
···
152
152
}, {
153
153
.name = "lm_2", .id = LM_2,
154
154
.base = 0x46000, .len = 0x320,
155
-
.features = MIXER_SDM845_MASK,
155
+
.features = MIXER_MSM8998_MASK,
156
156
.sblk = &sdm845_lm_sblk,
157
157
.lm_pair = LM_3,
158
158
.pingpong = PINGPONG_2,
···
160
160
}, {
161
161
.name = "lm_3", .id = LM_3,
162
162
.base = 0x47000, .len = 0x320,
163
-
.features = MIXER_SDM845_MASK,
163
+
.features = MIXER_MSM8998_MASK,
164
164
.sblk = &sdm845_lm_sblk,
165
165
.lm_pair = LM_2,
166
166
.pingpong = PINGPONG_3,
···
168
168
}, {
169
169
.name = "lm_4", .id = LM_4,
170
170
.base = 0x48000, .len = 0x320,
171
-
.features = MIXER_SDM845_MASK,
171
+
.features = MIXER_MSM8998_MASK,
172
172
.sblk = &sdm845_lm_sblk,
173
173
.lm_pair = LM_5,
174
174
.pingpong = PINGPONG_4,
175
175
}, {
176
176
.name = "lm_5", .id = LM_5,
177
177
.base = 0x49000, .len = 0x320,
178
-
.features = MIXER_SDM845_MASK,
178
+
.features = MIXER_MSM8998_MASK,
179
179
.sblk = &sdm845_lm_sblk,
180
180
.lm_pair = LM_4,
181
181
.pingpong = PINGPONG_5,
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
+4
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
···
109
109
{
110
110
.name = "lm_0", .id = LM_0,
111
111
.base = 0x44000, .len = 0x320,
112
-
.features = MIXER_SDM845_MASK,
112
+
.features = MIXER_MSM8998_MASK,
113
113
.sblk = &sdm845_lm_sblk,
114
114
.lm_pair = LM_1,
115
115
.pingpong = PINGPONG_0,
···
117
117
}, {
118
118
.name = "lm_1", .id = LM_1,
119
119
.base = 0x45000, .len = 0x320,
120
-
.features = MIXER_SDM845_MASK,
120
+
.features = MIXER_MSM8998_MASK,
121
121
.sblk = &sdm845_lm_sblk,
122
122
.lm_pair = LM_0,
123
123
.pingpong = PINGPONG_1,
···
125
125
}, {
126
126
.name = "lm_2", .id = LM_2,
127
127
.base = 0x46000, .len = 0x320,
128
-
.features = MIXER_SDM845_MASK,
128
+
.features = MIXER_MSM8998_MASK,
129
129
.sblk = &sdm845_lm_sblk,
130
130
.lm_pair = LM_3,
131
131
.pingpong = PINGPONG_2,
132
132
}, {
133
133
.name = "lm_3", .id = LM_3,
134
134
.base = 0x47000, .len = 0x320,
135
-
.features = MIXER_SDM845_MASK,
135
+
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_2,
138
138
.pingpong = PINGPONG_3,
-3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
-3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
···
107
107
{
108
108
.name = "lm_0", .id = LM_0,
109
109
.base = 0x44000, .len = 0x320,
110
-
.features = MIXER_QCM2290_MASK,
111
110
.sblk = &sdm845_lm_sblk,
112
111
.pingpong = PINGPONG_0,
113
112
.dspp = DSPP_0,
114
113
}, {
115
114
.name = "lm_1", .id = LM_1,
116
115
.base = 0x45000, .len = 0x320,
117
-
.features = MIXER_QCM2290_MASK,
118
116
.sblk = &sdm845_lm_sblk,
119
117
.pingpong = PINGPONG_1,
120
118
}, {
121
119
.name = "lm_2", .id = LM_2,
122
120
.base = 0x46000, .len = 0x320,
123
-
.features = MIXER_QCM2290_MASK,
124
121
.sblk = &sdm845_lm_sblk,
125
122
.pingpong = PINGPONG_2,
126
123
},
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
···
91
91
{
92
92
.name = "lm_0", .id = LM_0,
93
93
.base = 0x44000, .len = 0x320,
94
-
.features = MIXER_QCM2290_MASK,
95
94
.sblk = &sdm845_lm_sblk,
96
95
.pingpong = PINGPONG_0,
97
96
.dspp = DSPP_0,
···
98
99
}, {
99
100
.name = "lm_1", .id = LM_1,
100
101
.base = 0x45000, .len = 0x320,
101
-
.features = MIXER_QCM2290_MASK,
102
102
.sblk = &sdm845_lm_sblk,
103
103
.pingpong = PINGPONG_1,
104
104
.dspp = 0,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
···
135
135
{
136
136
.name = "lm_0", .id = LM_0,
137
137
.base = 0x44000, .len = 0x320,
138
-
.features = MIXER_SDM845_MASK,
138
+
.features = MIXER_MSM8998_MASK,
139
139
.sblk = &sdm845_lm_sblk,
140
140
.lm_pair = LM_1,
141
141
.pingpong = PINGPONG_0,
···
143
143
}, {
144
144
.name = "lm_1", .id = LM_1,
145
145
.base = 0x45000, .len = 0x320,
146
-
.features = MIXER_SDM845_MASK,
146
+
.features = MIXER_MSM8998_MASK,
147
147
.sblk = &sdm845_lm_sblk,
148
148
.lm_pair = LM_0,
149
149
.pingpong = PINGPONG_1,
···
151
151
}, {
152
152
.name = "lm_2", .id = LM_2,
153
153
.base = 0x46000, .len = 0x320,
154
-
.features = MIXER_SDM845_MASK,
154
+
.features = MIXER_MSM8998_MASK,
155
155
.sblk = &sdm845_lm_sblk,
156
156
.lm_pair = LM_3,
157
157
.pingpong = PINGPONG_2,
···
159
159
}, {
160
160
.name = "lm_3", .id = LM_3,
161
161
.base = 0x47000, .len = 0x320,
162
-
.features = MIXER_SDM845_MASK,
162
+
.features = MIXER_MSM8998_MASK,
163
163
.sblk = &sdm845_lm_sblk,
164
164
.lm_pair = LM_2,
165
165
.pingpong = PINGPONG_3,
···
167
167
}, {
168
168
.name = "lm_4", .id = LM_4,
169
169
.base = 0x48000, .len = 0x320,
170
-
.features = MIXER_SDM845_MASK,
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
176
.base = 0x49000, .len = 0x320,
177
-
.features = MIXER_SDM845_MASK,
177
+
.features = MIXER_MSM8998_MASK,
178
178
.sblk = &sdm845_lm_sblk,
179
179
.lm_pair = LM_4,
180
180
.pingpong = PINGPONG_5,
+2
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
+2
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
···
84
84
{
85
85
.name = "lm_0", .id = LM_0,
86
86
.base = 0x44000, .len = 0x320,
87
-
.features = MIXER_SDM845_MASK,
87
+
.features = MIXER_MSM8998_MASK,
88
88
.sblk = &sc7180_lm_sblk,
89
89
.lm_pair = LM_1,
90
90
.pingpong = PINGPONG_0,
···
92
92
}, {
93
93
.name = "lm_1", .id = LM_1,
94
94
.base = 0x45000, .len = 0x320,
95
-
.features = MIXER_SDM845_MASK,
95
+
.features = MIXER_MSM8998_MASK,
96
96
.sblk = &sc7180_lm_sblk,
97
97
.lm_pair = LM_0,
98
98
.pingpong = PINGPONG_1,
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
+2
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
+2
-2
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
···
91
91
{
92
92
.name = "lm_0", .id = LM_0,
93
93
.base = 0x44000, .len = 0x320,
94
-
.features = MIXER_SDM845_MASK,
94
+
.features = MIXER_MSM8998_MASK,
95
95
.sblk = &sc7180_lm_sblk,
96
96
.lm_pair = LM_1,
97
97
.pingpong = PINGPONG_0,
···
99
99
}, {
100
100
.name = "lm_1", .id = LM_1,
101
101
.base = 0x45000, .len = 0x320,
102
-
.features = MIXER_SDM845_MASK,
102
+
.features = MIXER_MSM8998_MASK,
103
103
.sblk = &sc7180_lm_sblk,
104
104
.lm_pair = LM_0,
105
105
.pingpong = PINGPONG_1,
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
-1
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
···
135
135
{
136
136
.name = "lm_0", .id = LM_0,
137
137
.base = 0x44000, .len = 0x320,
138
-
.features = MIXER_SDM845_MASK,
138
+
.features = MIXER_MSM8998_MASK,
139
139
.sblk = &sdm845_lm_sblk,
140
140
.lm_pair = LM_1,
141
141
.pingpong = PINGPONG_0,
···
143
143
}, {
144
144
.name = "lm_1", .id = LM_1,
145
145
.base = 0x45000, .len = 0x320,
146
-
.features = MIXER_SDM845_MASK,
146
+
.features = MIXER_MSM8998_MASK,
147
147
.sblk = &sdm845_lm_sblk,
148
148
.lm_pair = LM_0,
149
149
.pingpong = PINGPONG_1,
···
151
151
}, {
152
152
.name = "lm_2", .id = LM_2,
153
153
.base = 0x46000, .len = 0x320,
154
-
.features = MIXER_SDM845_MASK,
154
+
.features = MIXER_MSM8998_MASK,
155
155
.sblk = &sdm845_lm_sblk,
156
156
.lm_pair = LM_3,
157
157
.pingpong = PINGPONG_2,
···
159
159
}, {
160
160
.name = "lm_3", .id = LM_3,
161
161
.base = 0x47000, .len = 0x320,
162
-
.features = MIXER_SDM845_MASK,
162
+
.features = MIXER_MSM8998_MASK,
163
163
.sblk = &sdm845_lm_sblk,
164
164
.lm_pair = LM_2,
165
165
.pingpong = PINGPONG_3,
···
167
167
}, {
168
168
.name = "lm_4", .id = LM_4,
169
169
.base = 0x48000, .len = 0x320,
170
-
.features = MIXER_SDM845_MASK,
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
176
.base = 0x49000, .len = 0x320,
177
-
.features = MIXER_SDM845_MASK,
177
+
.features = MIXER_MSM8998_MASK,
178
178
.sblk = &sdm845_lm_sblk,
179
179
.lm_pair = LM_4,
180
180
.pingpong = PINGPONG_5,
+3
-3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
+3
-3
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
···
88
88
{
89
89
.name = "lm_0", .id = LM_0,
90
90
.base = 0x44000, .len = 0x320,
91
-
.features = MIXER_SDM845_MASK,
91
+
.features = MIXER_MSM8998_MASK,
92
92
.sblk = &sc7180_lm_sblk,
93
93
.pingpong = PINGPONG_0,
94
94
.dspp = DSPP_0,
95
95
}, {
96
96
.name = "lm_2", .id = LM_2,
97
97
.base = 0x46000, .len = 0x320,
98
-
.features = MIXER_SDM845_MASK,
98
+
.features = MIXER_MSM8998_MASK,
99
99
.sblk = &sc7180_lm_sblk,
100
100
.lm_pair = LM_3,
101
101
.pingpong = PINGPONG_2,
102
102
}, {
103
103
.name = "lm_3", .id = LM_3,
104
104
.base = 0x47000, .len = 0x320,
105
-
.features = MIXER_SDM845_MASK,
105
+
.features = MIXER_MSM8998_MASK,
106
106
.sblk = &sc7180_lm_sblk,
107
107
.lm_pair = LM_2,
108
108
.pingpong = PINGPONG_3,
+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
···
134
134
{
135
135
.name = "lm_0", .id = LM_0,
136
136
.base = 0x44000, .len = 0x320,
137
-
.features = MIXER_SDM845_MASK,
137
+
.features = MIXER_MSM8998_MASK,
138
138
.sblk = &sdm845_lm_sblk,
139
139
.lm_pair = LM_1,
140
140
.pingpong = PINGPONG_0,
···
142
142
}, {
143
143
.name = "lm_1", .id = LM_1,
144
144
.base = 0x45000, .len = 0x320,
145
-
.features = MIXER_SDM845_MASK,
145
+
.features = MIXER_MSM8998_MASK,
146
146
.sblk = &sdm845_lm_sblk,
147
147
.lm_pair = LM_0,
148
148
.pingpong = PINGPONG_1,
···
150
150
}, {
151
151
.name = "lm_2", .id = LM_2,
152
152
.base = 0x46000, .len = 0x320,
153
-
.features = MIXER_SDM845_MASK,
153
+
.features = MIXER_MSM8998_MASK,
154
154
.sblk = &sdm845_lm_sblk,
155
155
.lm_pair = LM_3,
156
156
.pingpong = PINGPONG_2,
···
158
158
}, {
159
159
.name = "lm_3", .id = LM_3,
160
160
.base = 0x47000, .len = 0x320,
161
-
.features = MIXER_SDM845_MASK,
161
+
.features = MIXER_MSM8998_MASK,
162
162
.sblk = &sdm845_lm_sblk,
163
163
.lm_pair = LM_2,
164
164
.pingpong = PINGPONG_3,
···
166
166
}, {
167
167
.name = "lm_4", .id = LM_4,
168
168
.base = 0x48000, .len = 0x320,
169
-
.features = MIXER_SDM845_MASK,
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
175
.base = 0x49000, .len = 0x320,
176
-
.features = MIXER_SDM845_MASK,
176
+
.features = MIXER_MSM8998_MASK,
177
177
.sblk = &sdm845_lm_sblk,
178
178
.lm_pair = LM_4,
179
179
.pingpong = PINGPONG_5,
+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
···
135
135
{
136
136
.name = "lm_0", .id = LM_0,
137
137
.base = 0x44000, .len = 0x320,
138
-
.features = MIXER_SDM845_MASK,
138
+
.features = MIXER_MSM8998_MASK,
139
139
.sblk = &sdm845_lm_sblk,
140
140
.lm_pair = LM_1,
141
141
.pingpong = PINGPONG_0,
···
143
143
}, {
144
144
.name = "lm_1", .id = LM_1,
145
145
.base = 0x45000, .len = 0x320,
146
-
.features = MIXER_SDM845_MASK,
146
+
.features = MIXER_MSM8998_MASK,
147
147
.sblk = &sdm845_lm_sblk,
148
148
.lm_pair = LM_0,
149
149
.pingpong = PINGPONG_1,
···
151
151
}, {
152
152
.name = "lm_2", .id = LM_2,
153
153
.base = 0x46000, .len = 0x320,
154
-
.features = MIXER_SDM845_MASK,
154
+
.features = MIXER_MSM8998_MASK,
155
155
.sblk = &sdm845_lm_sblk,
156
156
.lm_pair = LM_3,
157
157
.pingpong = PINGPONG_2,
···
159
159
}, {
160
160
.name = "lm_3", .id = LM_3,
161
161
.base = 0x47000, .len = 0x320,
162
-
.features = MIXER_SDM845_MASK,
162
+
.features = MIXER_MSM8998_MASK,
163
163
.sblk = &sdm845_lm_sblk,
164
164
.lm_pair = LM_2,
165
165
.pingpong = PINGPONG_3,
···
167
167
}, {
168
168
.name = "lm_4", .id = LM_4,
169
169
.base = 0x48000, .len = 0x320,
170
-
.features = MIXER_SDM845_MASK,
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
176
.base = 0x49000, .len = 0x320,
177
-
.features = MIXER_SDM845_MASK,
177
+
.features = MIXER_MSM8998_MASK,
178
178
.sblk = &sdm845_lm_sblk,
179
179
.lm_pair = LM_4,
180
180
.pingpong = PINGPONG_5,
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
+6
-6
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
···
134
134
{
135
135
.name = "lm_0", .id = LM_0,
136
136
.base = 0x44000, .len = 0x400,
137
-
.features = MIXER_SDM845_MASK,
137
+
.features = MIXER_MSM8998_MASK,
138
138
.sblk = &sdm845_lm_sblk,
139
139
.lm_pair = LM_1,
140
140
.pingpong = PINGPONG_0,
···
142
142
}, {
143
143
.name = "lm_1", .id = LM_1,
144
144
.base = 0x45000, .len = 0x400,
145
-
.features = MIXER_SDM845_MASK,
145
+
.features = MIXER_MSM8998_MASK,
146
146
.sblk = &sdm845_lm_sblk,
147
147
.lm_pair = LM_0,
148
148
.pingpong = PINGPONG_1,
···
150
150
}, {
151
151
.name = "lm_2", .id = LM_2,
152
152
.base = 0x46000, .len = 0x400,
153
-
.features = MIXER_SDM845_MASK,
153
+
.features = MIXER_MSM8998_MASK,
154
154
.sblk = &sdm845_lm_sblk,
155
155
.lm_pair = LM_3,
156
156
.pingpong = PINGPONG_2,
···
158
158
}, {
159
159
.name = "lm_3", .id = LM_3,
160
160
.base = 0x47000, .len = 0x400,
161
-
.features = MIXER_SDM845_MASK,
161
+
.features = MIXER_MSM8998_MASK,
162
162
.sblk = &sdm845_lm_sblk,
163
163
.lm_pair = LM_2,
164
164
.pingpong = PINGPONG_3,
···
166
166
}, {
167
167
.name = "lm_4", .id = LM_4,
168
168
.base = 0x48000, .len = 0x400,
169
-
.features = MIXER_SDM845_MASK,
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
175
.base = 0x49000, .len = 0x400,
176
-
.features = MIXER_SDM845_MASK,
176
+
.features = MIXER_MSM8998_MASK,
177
177
.sblk = &sdm845_lm_sblk,
178
178
.lm_pair = LM_4,
179
179
.pingpong = PINGPONG_5,
+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
···
132
132
{
133
133
.name = "lm_0", .id = LM_0,
134
134
.base = 0x44000, .len = 0x320,
135
-
.features = MIXER_SDM845_MASK,
135
+
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_1,
138
138
.pingpong = PINGPONG_0,
···
140
140
}, {
141
141
.name = "lm_1", .id = LM_1,
142
142
.base = 0x45000, .len = 0x320,
143
-
.features = MIXER_SDM845_MASK,
143
+
.features = MIXER_MSM8998_MASK,
144
144
.sblk = &sdm845_lm_sblk,
145
145
.lm_pair = LM_0,
146
146
.pingpong = PINGPONG_1,
···
148
148
}, {
149
149
.name = "lm_2", .id = LM_2,
150
150
.base = 0x46000, .len = 0x320,
151
-
.features = MIXER_SDM845_MASK,
151
+
.features = MIXER_MSM8998_MASK,
152
152
.sblk = &sdm845_lm_sblk,
153
153
.lm_pair = LM_3,
154
154
.pingpong = PINGPONG_2,
···
156
156
}, {
157
157
.name = "lm_3", .id = LM_3,
158
158
.base = 0x47000, .len = 0x320,
159
-
.features = MIXER_SDM845_MASK,
159
+
.features = MIXER_MSM8998_MASK,
160
160
.sblk = &sdm845_lm_sblk,
161
161
.lm_pair = LM_2,
162
162
.pingpong = PINGPONG_3,
···
164
164
}, {
165
165
.name = "lm_4", .id = LM_4,
166
166
.base = 0x48000, .len = 0x320,
167
-
.features = MIXER_SDM845_MASK,
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
173
.base = 0x49000, .len = 0x320,
174
-
.features = MIXER_SDM845_MASK,
174
+
.features = MIXER_MSM8998_MASK,
175
175
.sblk = &sdm845_lm_sblk,
176
176
.lm_pair = LM_4,
177
177
.pingpong = PINGPONG_5,
+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
···
132
132
{
133
133
.name = "lm_0", .id = LM_0,
134
134
.base = 0x44000, .len = 0x320,
135
-
.features = MIXER_SDM845_MASK,
135
+
.features = MIXER_MSM8998_MASK,
136
136
.sblk = &sdm845_lm_sblk,
137
137
.lm_pair = LM_1,
138
138
.pingpong = PINGPONG_0,
···
140
140
}, {
141
141
.name = "lm_1", .id = LM_1,
142
142
.base = 0x45000, .len = 0x320,
143
-
.features = MIXER_SDM845_MASK,
143
+
.features = MIXER_MSM8998_MASK,
144
144
.sblk = &sdm845_lm_sblk,
145
145
.lm_pair = LM_0,
146
146
.pingpong = PINGPONG_1,
···
148
148
}, {
149
149
.name = "lm_2", .id = LM_2,
150
150
.base = 0x46000, .len = 0x320,
151
-
.features = MIXER_SDM845_MASK,
151
+
.features = MIXER_MSM8998_MASK,
152
152
.sblk = &sdm845_lm_sblk,
153
153
.lm_pair = LM_3,
154
154
.pingpong = PINGPONG_2,
···
156
156
}, {
157
157
.name = "lm_3", .id = LM_3,
158
158
.base = 0x47000, .len = 0x320,
159
-
.features = MIXER_SDM845_MASK,
159
+
.features = MIXER_MSM8998_MASK,
160
160
.sblk = &sdm845_lm_sblk,
161
161
.lm_pair = LM_2,
162
162
.pingpong = PINGPONG_3,
···
164
164
}, {
165
165
.name = "lm_4", .id = LM_4,
166
166
.base = 0x48000, .len = 0x320,
167
-
.features = MIXER_SDM845_MASK,
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
173
.base = 0x49000, .len = 0x320,
174
-
.features = MIXER_SDM845_MASK,
174
+
.features = MIXER_MSM8998_MASK,
175
175
.sblk = &sdm845_lm_sblk,
176
176
.lm_pair = LM_4,
177
177
.pingpong = PINGPONG_5,
+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
···
131
131
{
132
132
.name = "lm_0", .id = LM_0,
133
133
.base = 0x44000, .len = 0x320,
134
-
.features = MIXER_SDM845_MASK,
134
+
.features = MIXER_MSM8998_MASK,
135
135
.sblk = &sdm845_lm_sblk,
136
136
.lm_pair = LM_1,
137
137
.pingpong = PINGPONG_0,
···
139
139
}, {
140
140
.name = "lm_1", .id = LM_1,
141
141
.base = 0x45000, .len = 0x320,
142
-
.features = MIXER_SDM845_MASK,
142
+
.features = MIXER_MSM8998_MASK,
143
143
.sblk = &sdm845_lm_sblk,
144
144
.lm_pair = LM_0,
145
145
.pingpong = PINGPONG_1,
···
147
147
}, {
148
148
.name = "lm_2", .id = LM_2,
149
149
.base = 0x46000, .len = 0x320,
150
-
.features = MIXER_SDM845_MASK,
150
+
.features = MIXER_MSM8998_MASK,
151
151
.sblk = &sdm845_lm_sblk,
152
152
.lm_pair = LM_3,
153
153
.pingpong = PINGPONG_2,
···
155
155
}, {
156
156
.name = "lm_3", .id = LM_3,
157
157
.base = 0x47000, .len = 0x320,
158
-
.features = MIXER_SDM845_MASK,
158
+
.features = MIXER_MSM8998_MASK,
159
159
.sblk = &sdm845_lm_sblk,
160
160
.lm_pair = LM_2,
161
161
.pingpong = PINGPONG_3,
···
163
163
}, {
164
164
.name = "lm_4", .id = LM_4,
165
165
.base = 0x48000, .len = 0x320,
166
-
.features = MIXER_SDM845_MASK,
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
172
.base = 0x49000, .len = 0x320,
173
-
.features = MIXER_SDM845_MASK,
173
+
.features = MIXER_MSM8998_MASK,
174
174
.sblk = &sdm845_lm_sblk,
175
175
.lm_pair = LM_4,
176
176
.pingpong = PINGPONG_5,
-6
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
-6
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
···
89
89
#define MIXER_MSM8998_MASK \
90
90
(BIT(DPU_MIXER_SOURCESPLIT))
91
91
92
-
#define MIXER_SDM845_MASK \
93
-
(BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER))
94
-
95
-
#define MIXER_QCM2290_MASK \
96
-
(BIT(DPU_DIM_LAYER))
97
-
98
92
#define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \
99
93
BIT(DPU_WB_UBWC) | \
100
94
BIT(DPU_WB_YUV_CONFIG) | \
-2
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
-2
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
···
84
84
* @DPU_MIXER_LAYER Layer mixer layer blend configuration,
85
85
* @DPU_MIXER_SOURCESPLIT Layer mixer supports source-split configuration
86
86
* @DPU_MIXER_GC Gamma correction block
87
-
* @DPU_DIM_LAYER Layer mixer supports dim layer
88
87
* @DPU_MIXER_MAX maximum value
89
88
*/
90
89
enum {
91
90
DPU_MIXER_LAYER = 0x1,
92
91
DPU_MIXER_SOURCESPLIT,
93
92
DPU_MIXER_GC,
94
-
DPU_DIM_LAYER,
95
93
DPU_MIXER_MAX
96
94
};
97
95