Skip to content

Commit 832ee64

Browse files
robclarkrobclark
committed
drm/msm/adreno: Remove GPU name
No real need to have marketing names in the kernel. Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/549757/
1 parent fa0f4d0 commit 832ee64

File tree

3 files changed

+5
-34
lines changed

3 files changed

+5
-34
lines changed

‎drivers/gpu/drm/msm/adreno/adreno_device.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static const struct adreno_info gpulist[] = {
2424
{
2525
.rev = ADRENO_REV(2, 0, 0, 0),
2626
.revn = 200,
27-
.name = "A200",
2827
.fw = {
2928
[ADRENO_FW_PM4] = "yamato_pm4.fw",
3029
[ADRENO_FW_PFP] = "yamato_pfp.fw",
@@ -35,7 +34,6 @@ static const struct adreno_info gpulist[] = {
3534
}, { /* a200 on i.mx51 has only 128kib gmem */
3635
.rev = ADRENO_REV(2, 0, 0, 1),
3736
.revn = 201,
38-
.name = "A200",
3937
.fw = {
4038
[ADRENO_FW_PM4] = "yamato_pm4.fw",
4139
[ADRENO_FW_PFP] = "yamato_pfp.fw",
@@ -46,7 +44,6 @@ static const struct adreno_info gpulist[] = {
4644
}, {
4745
.rev = ADRENO_REV(2, 2, 0, ANY_ID),
4846
.revn = 220,
49-
.name = "A220",
5047
.fw = {
5148
[ADRENO_FW_PM4] = "leia_pm4_470.fw",
5249
[ADRENO_FW_PFP] = "leia_pfp_470.fw",
@@ -57,7 +54,6 @@ static const struct adreno_info gpulist[] = {
5754
}, {
5855
.rev = ADRENO_REV(3, 0, 5, ANY_ID),
5956
.revn = 305,
60-
.name = "A305",
6157
.fw = {
6258
[ADRENO_FW_PM4] = "a300_pm4.fw",
6359
[ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -68,7 +64,6 @@ static const struct adreno_info gpulist[] = {
6864
}, {
6965
.rev = ADRENO_REV(3, 0, 6, 0),
7066
.revn = 307, /* because a305c is revn==306 */
71-
.name = "A306",
7267
.fw = {
7368
[ADRENO_FW_PM4] = "a300_pm4.fw",
7469
[ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -79,7 +74,6 @@ static const struct adreno_info gpulist[] = {
7974
}, {
8075
.rev = ADRENO_REV(3, 2, ANY_ID, ANY_ID),
8176
.revn = 320,
82-
.name = "A320",
8377
.fw = {
8478
[ADRENO_FW_PM4] = "a300_pm4.fw",
8579
[ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -90,7 +84,6 @@ static const struct adreno_info gpulist[] = {
9084
}, {
9185
.rev = ADRENO_REV(3, 3, 0, ANY_ID),
9286
.revn = 330,
93-
.name = "A330",
9487
.fw = {
9588
[ADRENO_FW_PM4] = "a330_pm4.fw",
9689
[ADRENO_FW_PFP] = "a330_pfp.fw",
@@ -101,7 +94,6 @@ static const struct adreno_info gpulist[] = {
10194
}, {
10295
.rev = ADRENO_REV(4, 0, 5, ANY_ID),
10396
.revn = 405,
104-
.name = "A405",
10597
.fw = {
10698
[ADRENO_FW_PM4] = "a420_pm4.fw",
10799
[ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -112,7 +104,6 @@ static const struct adreno_info gpulist[] = {
112104
}, {
113105
.rev = ADRENO_REV(4, 2, 0, ANY_ID),
114106
.revn = 420,
115-
.name = "A420",
116107
.fw = {
117108
[ADRENO_FW_PM4] = "a420_pm4.fw",
118109
[ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -123,7 +114,6 @@ static const struct adreno_info gpulist[] = {
123114
}, {
124115
.rev = ADRENO_REV(4, 3, 0, ANY_ID),
125116
.revn = 430,
126-
.name = "A430",
127117
.fw = {
128118
[ADRENO_FW_PM4] = "a420_pm4.fw",
129119
[ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -134,7 +124,6 @@ static const struct adreno_info gpulist[] = {
134124
}, {
135125
.rev = ADRENO_REV(5, 0, 6, ANY_ID),
136126
.revn = 506,
137-
.name = "A506",
138127
.fw = {
139128
[ADRENO_FW_PM4] = "a530_pm4.fw",
140129
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -152,7 +141,6 @@ static const struct adreno_info gpulist[] = {
152141
}, {
153142
.rev = ADRENO_REV(5, 0, 8, ANY_ID),
154143
.revn = 508,
155-
.name = "A508",
156144
.fw = {
157145
[ADRENO_FW_PM4] = "a530_pm4.fw",
158146
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -169,7 +157,6 @@ static const struct adreno_info gpulist[] = {
169157
}, {
170158
.rev = ADRENO_REV(5, 0, 9, ANY_ID),
171159
.revn = 509,
172-
.name = "A509",
173160
.fw = {
174161
[ADRENO_FW_PM4] = "a530_pm4.fw",
175162
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -187,7 +174,6 @@ static const struct adreno_info gpulist[] = {
187174
}, {
188175
.rev = ADRENO_REV(5, 1, 0, ANY_ID),
189176
.revn = 510,
190-
.name = "A510",
191177
.fw = {
192178
[ADRENO_FW_PM4] = "a530_pm4.fw",
193179
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -202,7 +188,6 @@ static const struct adreno_info gpulist[] = {
202188
}, {
203189
.rev = ADRENO_REV(5, 1, 2, ANY_ID),
204190
.revn = 512,
205-
.name = "A512",
206191
.fw = {
207192
[ADRENO_FW_PM4] = "a530_pm4.fw",
208193
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -219,7 +204,6 @@ static const struct adreno_info gpulist[] = {
219204
}, {
220205
.rev = ADRENO_REV(5, 3, 0, 2),
221206
.revn = 530,
222-
.name = "A530",
223207
.fw = {
224208
[ADRENO_FW_PM4] = "a530_pm4.fw",
225209
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -238,7 +222,6 @@ static const struct adreno_info gpulist[] = {
238222
}, {
239223
.rev = ADRENO_REV(5, 4, 0, ANY_ID),
240224
.revn = 540,
241-
.name = "A540",
242225
.fw = {
243226
[ADRENO_FW_PM4] = "a530_pm4.fw",
244227
[ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -256,7 +239,6 @@ static const struct adreno_info gpulist[] = {
256239
}, {
257240
.rev = ADRENO_REV(6, 1, 0, ANY_ID),
258241
.revn = 610,
259-
.name = "A610",
260242
.fw = {
261243
[ADRENO_FW_SQE] = "a630_sqe.fw",
262244
},
@@ -268,7 +250,6 @@ static const struct adreno_info gpulist[] = {
268250
}, {
269251
.rev = ADRENO_REV(6, 1, 8, ANY_ID),
270252
.revn = 618,
271-
.name = "A618",
272253
.fw = {
273254
[ADRENO_FW_SQE] = "a630_sqe.fw",
274255
[ADRENO_FW_GMU] = "a630_gmu.bin",
@@ -279,7 +260,6 @@ static const struct adreno_info gpulist[] = {
279260
}, {
280261
.rev = ADRENO_REV(6, 1, 9, ANY_ID),
281262
.revn = 619,
282-
.name = "A619",
283263
.fw = {
284264
[ADRENO_FW_SQE] = "a630_sqe.fw",
285265
[ADRENO_FW_GMU] = "a619_gmu.bin",
@@ -292,7 +272,6 @@ static const struct adreno_info gpulist[] = {
292272
}, {
293273
.rev = ADRENO_REV(6, 3, 0, ANY_ID),
294274
.revn = 630,
295-
.name = "A630",
296275
.fw = {
297276
[ADRENO_FW_SQE] = "a630_sqe.fw",
298277
[ADRENO_FW_GMU] = "a630_gmu.bin",
@@ -305,7 +284,6 @@ static const struct adreno_info gpulist[] = {
305284
}, {
306285
.rev = ADRENO_REV(6, 4, 0, ANY_ID),
307286
.revn = 640,
308-
.name = "A640",
309287
.fw = {
310288
[ADRENO_FW_SQE] = "a630_sqe.fw",
311289
[ADRENO_FW_GMU] = "a640_gmu.bin",
@@ -318,7 +296,6 @@ static const struct adreno_info gpulist[] = {
318296
}, {
319297
.rev = ADRENO_REV(6, 5, 0, ANY_ID),
320298
.revn = 650,
321-
.name = "A650",
322299
.fw = {
323300
[ADRENO_FW_SQE] = "a650_sqe.fw",
324301
[ADRENO_FW_GMU] = "a650_gmu.bin",
@@ -332,7 +309,6 @@ static const struct adreno_info gpulist[] = {
332309
}, {
333310
.rev = ADRENO_REV(6, 6, 0, ANY_ID),
334311
.revn = 660,
335-
.name = "A660",
336312
.fw = {
337313
[ADRENO_FW_SQE] = "a660_sqe.fw",
338314
[ADRENO_FW_GMU] = "a660_gmu.bin",
@@ -357,7 +333,6 @@ static const struct adreno_info gpulist[] = {
357333
}, {
358334
.rev = ADRENO_REV(6, 8, 0, ANY_ID),
359335
.revn = 680,
360-
.name = "A680",
361336
.fw = {
362337
[ADRENO_FW_SQE] = "a630_sqe.fw",
363338
[ADRENO_FW_GMU] = "a640_gmu.bin",

‎drivers/gpu/drm/msm/adreno/adreno_gpu.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,14 +1105,11 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
11051105
speedbin = 0xffff;
11061106
adreno_gpu->speedbin = (uint16_t) (0xffff & speedbin);
11071107

1108-
gpu_name = adreno_gpu->info->name;
1109-
if (!gpu_name) {
1110-
gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",
1111-
rev->core, rev->major, rev->minor,
1112-
rev->patchid);
1113-
if (!gpu_name)
1114-
return -ENOMEM;
1115-
}
1108+
gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",
1109+
rev->core, rev->major, rev->minor,
1110+
rev->patchid);
1111+
if (!gpu_name)
1112+
return -ENOMEM;
11161113

11171114
adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";
11181115

‎drivers/gpu/drm/msm/adreno/adreno_gpu.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ extern const struct adreno_reglist a660_hwcg[], a690_hwcg[];
6161
struct adreno_info {
6262
struct adreno_rev rev;
6363
uint32_t revn;
64-
const char *name;
6564
const char *fw[ADRENO_FW_MAX];
6665
uint32_t gmem;
6766
u64 quirks;

0 commit comments

Comments
 (0)