tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/radeon: Clean up errors in si_dpm.c
Fix the following errors reported by checkpatch:
ERROR: that open brace { should be on the previous line
Signed-off-by: GuoHua Chen <chenguohua_716@163.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
GuoHua Chen
and committed by
Alex Deucher
b42eecdf
9c7fdfa3
+44
-88
+44
-88
drivers/gpu/drm/radeon/si_dpm.c
+44
-88
drivers/gpu/drm/radeon/si_dpm.c
···
46
46
47
47
#define SCLK_MIN_DEEPSLEEP_FREQ 1350
48
48
49
-
static const struct si_cac_config_reg cac_weights_tahiti[] =
50
-
{
49
+
static const struct si_cac_config_reg cac_weights_tahiti[] = {
51
50
{ 0x0, 0x0000ffff, 0, 0xc, SISLANDS_CACCONFIG_CGIND },
52
51
{ 0x0, 0xffff0000, 16, 0x0, SISLANDS_CACCONFIG_CGIND },
53
52
{ 0x1, 0x0000ffff, 0, 0x101, SISLANDS_CACCONFIG_CGIND },
···
110
111
{ 0xFFFFFFFF }
111
112
};
112
113
113
-
static const struct si_cac_config_reg lcac_tahiti[] =
114
-
{
114
+
static const struct si_cac_config_reg lcac_tahiti[] = {
115
115
{ 0x143, 0x0001fffe, 1, 0x3, SISLANDS_CACCONFIG_CGIND },
116
116
{ 0x143, 0x00000001, 0, 0x1, SISLANDS_CACCONFIG_CGIND },
117
117
{ 0x146, 0x0001fffe, 1, 0x3, SISLANDS_CACCONFIG_CGIND },
···
201
203
202
204
};
203
205
204
-
static const struct si_cac_config_reg cac_override_tahiti[] =
205
-
{
206
+
static const struct si_cac_config_reg cac_override_tahiti[] = {
206
207
{ 0xFFFFFFFF }
207
208
};
208
209
209
-
static const struct si_powertune_data powertune_data_tahiti =
210
-
{
210
+
static const struct si_powertune_data powertune_data_tahiti = {
211
211
((1 << 16) | 27027),
212
212
6,
213
213
0,
···
235
239
true
236
240
};
237
241
238
-
static const struct si_dte_data dte_data_tahiti =
239
-
{
242
+
static const struct si_dte_data dte_data_tahiti = {
240
243
{ 1159409, 0, 0, 0, 0 },
241
244
{ 777, 0, 0, 0, 0 },
242
245
2,
···
252
257
false
253
258
};
254
259
255
-
static const struct si_dte_data dte_data_tahiti_pro =
256
-
{
260
+
static const struct si_dte_data dte_data_tahiti_pro = {
257
261
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
258
262
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
259
263
5,
···
269
275
true
270
276
};
271
277
272
-
static const struct si_dte_data dte_data_new_zealand =
273
-
{
278
+
static const struct si_dte_data dte_data_new_zealand = {
274
279
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0 },
275
280
{ 0x29B, 0x3E9, 0x537, 0x7D2, 0 },
276
281
0x5,
···
286
293
true
287
294
};
288
295
289
-
static const struct si_dte_data dte_data_aruba_pro =
290
-
{
296
+
static const struct si_dte_data dte_data_aruba_pro = {
291
297
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
292
298
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
293
299
5,
···
303
311
true
304
312
};
305
313
306
-
static const struct si_dte_data dte_data_malta =
307
-
{
314
+
static const struct si_dte_data dte_data_malta = {
308
315
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
309
316
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
310
317
5,
···
320
329
true
321
330
};
322
331
323
-
static struct si_cac_config_reg cac_weights_pitcairn[] =
324
-
{
332
+
static struct si_cac_config_reg cac_weights_pitcairn[] = {
325
333
{ 0x0, 0x0000ffff, 0, 0x8a, SISLANDS_CACCONFIG_CGIND },
326
334
{ 0x0, 0xffff0000, 16, 0x0, SISLANDS_CACCONFIG_CGIND },
327
335
{ 0x1, 0x0000ffff, 0, 0x0, SISLANDS_CACCONFIG_CGIND },
···
384
394
{ 0xFFFFFFFF }
385
395
};
386
396
387
-
static const struct si_cac_config_reg lcac_pitcairn[] =
388
-
{
397
+
static const struct si_cac_config_reg lcac_pitcairn[] = {
389
398
{ 0x98, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
390
399
{ 0x98, 0x00000001, 0, 0x1, SISLANDS_CACCONFIG_CGIND },
391
400
{ 0x104, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
···
474
485
{ 0xFFFFFFFF }
475
486
};
476
487
477
-
static const struct si_cac_config_reg cac_override_pitcairn[] =
478
-
{
488
+
static const struct si_cac_config_reg cac_override_pitcairn[] = {
479
489
{ 0xFFFFFFFF }
480
490
};
481
491
482
-
static const struct si_powertune_data powertune_data_pitcairn =
483
-
{
492
+
static const struct si_powertune_data powertune_data_pitcairn = {
484
493
((1 << 16) | 27027),
485
494
5,
486
495
0,
···
508
521
true
509
522
};
510
523
511
-
static const struct si_dte_data dte_data_pitcairn =
512
-
{
524
+
static const struct si_dte_data dte_data_pitcairn = {
513
525
{ 0, 0, 0, 0, 0 },
514
526
{ 0, 0, 0, 0, 0 },
515
527
0,
···
525
539
false
526
540
};
527
541
528
-
static const struct si_dte_data dte_data_curacao_xt =
529
-
{
542
+
static const struct si_dte_data dte_data_curacao_xt = {
530
543
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
531
544
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
532
545
5,
···
542
557
true
543
558
};
544
559
545
-
static const struct si_dte_data dte_data_curacao_pro =
546
-
{
560
+
static const struct si_dte_data dte_data_curacao_pro = {
547
561
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
548
562
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
549
563
5,
···
559
575
true
560
576
};
561
577
562
-
static const struct si_dte_data dte_data_neptune_xt =
563
-
{
578
+
static const struct si_dte_data dte_data_neptune_xt = {
564
579
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
565
580
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
566
581
5,
···
576
593
true
577
594
};
578
595
579
-
static const struct si_cac_config_reg cac_weights_chelsea_pro[] =
580
-
{
596
+
static const struct si_cac_config_reg cac_weights_chelsea_pro[] = {
581
597
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
582
598
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
583
599
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
640
658
{ 0xFFFFFFFF }
641
659
};
642
660
643
-
static const struct si_cac_config_reg cac_weights_chelsea_xt[] =
644
-
{
661
+
static const struct si_cac_config_reg cac_weights_chelsea_xt[] = {
645
662
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
646
663
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
647
664
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
704
723
{ 0xFFFFFFFF }
705
724
};
706
725
707
-
static const struct si_cac_config_reg cac_weights_heathrow[] =
708
-
{
726
+
static const struct si_cac_config_reg cac_weights_heathrow[] = {
709
727
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
710
728
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
711
729
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
768
788
{ 0xFFFFFFFF }
769
789
};
770
790
771
-
static const struct si_cac_config_reg cac_weights_cape_verde_pro[] =
772
-
{
791
+
static const struct si_cac_config_reg cac_weights_cape_verde_pro[] = {
773
792
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
774
793
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
775
794
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
832
853
{ 0xFFFFFFFF }
833
854
};
834
855
835
-
static const struct si_cac_config_reg cac_weights_cape_verde[] =
836
-
{
856
+
static const struct si_cac_config_reg cac_weights_cape_verde[] = {
837
857
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
838
858
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
839
859
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
896
918
{ 0xFFFFFFFF }
897
919
};
898
920
899
-
static const struct si_cac_config_reg lcac_cape_verde[] =
900
-
{
921
+
static const struct si_cac_config_reg lcac_cape_verde[] = {
901
922
{ 0x98, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
902
923
{ 0x98, 0x00000001, 0, 0x1, SISLANDS_CACCONFIG_CGIND },
903
924
{ 0x104, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
···
954
977
{ 0xFFFFFFFF }
955
978
};
956
979
957
-
static const struct si_cac_config_reg cac_override_cape_verde[] =
958
-
{
980
+
static const struct si_cac_config_reg cac_override_cape_verde[] = {
959
981
{ 0xFFFFFFFF }
960
982
};
961
983
962
-
static const struct si_powertune_data powertune_data_cape_verde =
963
-
{
984
+
static const struct si_powertune_data powertune_data_cape_verde = {
964
985
((1 << 16) | 0x6993),
965
986
5,
966
987
0,
···
988
1013
true
989
1014
};
990
1015
991
-
static const struct si_dte_data dte_data_cape_verde =
992
-
{
1016
+
static const struct si_dte_data dte_data_cape_verde = {
993
1017
{ 0, 0, 0, 0, 0 },
994
1018
{ 0, 0, 0, 0, 0 },
995
1019
0,
···
1005
1031
false
1006
1032
};
1007
1033
1008
-
static const struct si_dte_data dte_data_venus_xtx =
1009
-
{
1034
+
static const struct si_dte_data dte_data_venus_xtx = {
1010
1035
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
1011
1036
{ 0x71C, 0xAAB, 0xE39, 0x11C7, 0x0 },
1012
1037
5,
···
1022
1049
true
1023
1050
};
1024
1051
1025
-
static const struct si_dte_data dte_data_venus_xt =
1026
-
{
1052
+
static const struct si_dte_data dte_data_venus_xt = {
1027
1053
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
1028
1054
{ 0xBDA, 0x11C7, 0x17B4, 0x1DA1, 0x0 },
1029
1055
5,
···
1039
1067
true
1040
1068
};
1041
1069
1042
-
static const struct si_dte_data dte_data_venus_pro =
1043
-
{
1070
+
static const struct si_dte_data dte_data_venus_pro = {
1044
1071
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
1045
1072
{ 0x11C7, 0x1AAB, 0x238E, 0x2C72, 0x0 },
1046
1073
5,
···
1056
1085
true
1057
1086
};
1058
1087
1059
-
static struct si_cac_config_reg cac_weights_oland[] =
1060
-
{
1088
+
static struct si_cac_config_reg cac_weights_oland[] = {
1061
1089
{ 0x0, 0x0000ffff, 0, 0x82, SISLANDS_CACCONFIG_CGIND },
1062
1090
{ 0x0, 0xffff0000, 16, 0x4F, SISLANDS_CACCONFIG_CGIND },
1063
1091
{ 0x1, 0x0000ffff, 0, 0x153, SISLANDS_CACCONFIG_CGIND },
···
1120
1150
{ 0xFFFFFFFF }
1121
1151
};
1122
1152
1123
-
static const struct si_cac_config_reg cac_weights_mars_pro[] =
1124
-
{
1153
+
static const struct si_cac_config_reg cac_weights_mars_pro[] = {
1125
1154
{ 0x0, 0x0000ffff, 0, 0x43, SISLANDS_CACCONFIG_CGIND },
1126
1155
{ 0x0, 0xffff0000, 16, 0x29, SISLANDS_CACCONFIG_CGIND },
1127
1156
{ 0x1, 0x0000ffff, 0, 0xAF, SISLANDS_CACCONFIG_CGIND },
···
1184
1215
{ 0xFFFFFFFF }
1185
1216
};
1186
1217
1187
-
static const struct si_cac_config_reg cac_weights_mars_xt[] =
1188
-
{
1218
+
static const struct si_cac_config_reg cac_weights_mars_xt[] = {
1189
1219
{ 0x0, 0x0000ffff, 0, 0x43, SISLANDS_CACCONFIG_CGIND },
1190
1220
{ 0x0, 0xffff0000, 16, 0x29, SISLANDS_CACCONFIG_CGIND },
1191
1221
{ 0x1, 0x0000ffff, 0, 0xAF, SISLANDS_CACCONFIG_CGIND },
···
1248
1280
{ 0xFFFFFFFF }
1249
1281
};
1250
1282
1251
-
static const struct si_cac_config_reg cac_weights_oland_pro[] =
1252
-
{
1283
+
static const struct si_cac_config_reg cac_weights_oland_pro[] = {
1253
1284
{ 0x0, 0x0000ffff, 0, 0x43, SISLANDS_CACCONFIG_CGIND },
1254
1285
{ 0x0, 0xffff0000, 16, 0x29, SISLANDS_CACCONFIG_CGIND },
1255
1286
{ 0x1, 0x0000ffff, 0, 0xAF, SISLANDS_CACCONFIG_CGIND },
···
1312
1345
{ 0xFFFFFFFF }
1313
1346
};
1314
1347
1315
-
static const struct si_cac_config_reg cac_weights_oland_xt[] =
1316
-
{
1348
+
static const struct si_cac_config_reg cac_weights_oland_xt[] = {
1317
1349
{ 0x0, 0x0000ffff, 0, 0x43, SISLANDS_CACCONFIG_CGIND },
1318
1350
{ 0x0, 0xffff0000, 16, 0x29, SISLANDS_CACCONFIG_CGIND },
1319
1351
{ 0x1, 0x0000ffff, 0, 0xAF, SISLANDS_CACCONFIG_CGIND },
···
1376
1410
{ 0xFFFFFFFF }
1377
1411
};
1378
1412
1379
-
static const struct si_cac_config_reg lcac_oland[] =
1380
-
{
1413
+
static const struct si_cac_config_reg lcac_oland[] = {
1381
1414
{ 0x98, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
1382
1415
{ 0x98, 0x00000001, 0, 0x1, SISLANDS_CACCONFIG_CGIND },
1383
1416
{ 0x104, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
···
1422
1457
{ 0xFFFFFFFF }
1423
1458
};
1424
1459
1425
-
static const struct si_cac_config_reg lcac_mars_pro[] =
1426
-
{
1460
+
static const struct si_cac_config_reg lcac_mars_pro[] = {
1427
1461
{ 0x98, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
1428
1462
{ 0x98, 0x00000001, 0, 0x1, SISLANDS_CACCONFIG_CGIND },
1429
1463
{ 0x104, 0x0001fffe, 1, 0x2, SISLANDS_CACCONFIG_CGIND },
···
1468
1504
{ 0xFFFFFFFF }
1469
1505
};
1470
1506
1471
-
static const struct si_cac_config_reg cac_override_oland[] =
1472
-
{
1507
+
static const struct si_cac_config_reg cac_override_oland[] = {
1473
1508
{ 0xFFFFFFFF }
1474
1509
};
1475
1510
1476
-
static const struct si_powertune_data powertune_data_oland =
1477
-
{
1511
+
static const struct si_powertune_data powertune_data_oland = {
1478
1512
((1 << 16) | 0x6993),
1479
1513
5,
1480
1514
0,
···
1502
1540
true
1503
1541
};
1504
1542
1505
-
static const struct si_powertune_data powertune_data_mars_pro =
1506
-
{
1543
+
static const struct si_powertune_data powertune_data_mars_pro = {
1507
1544
((1 << 16) | 0x6993),
1508
1545
5,
1509
1546
0,
···
1532
1571
true
1533
1572
};
1534
1573
1535
-
static const struct si_dte_data dte_data_oland =
1536
-
{
1574
+
static const struct si_dte_data dte_data_oland = {
1537
1575
{ 0, 0, 0, 0, 0 },
1538
1576
{ 0, 0, 0, 0, 0 },
1539
1577
0,
···
1549
1589
false
1550
1590
};
1551
1591
1552
-
static const struct si_dte_data dte_data_mars_pro =
1553
-
{
1592
+
static const struct si_dte_data dte_data_mars_pro = {
1554
1593
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
1555
1594
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
1556
1595
5,
···
1566
1607
true
1567
1608
};
1568
1609
1569
-
static const struct si_dte_data dte_data_sun_xt =
1570
-
{
1610
+
static const struct si_dte_data dte_data_sun_xt = {
1571
1611
{ 0x1E8480, 0x3D0900, 0x989680, 0x2625A00, 0x0 },
1572
1612
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
1573
1613
5,
···
1584
1626
};
1585
1627
1586
1628
1587
-
static const struct si_cac_config_reg cac_weights_hainan[] =
1588
-
{
1629
+
static const struct si_cac_config_reg cac_weights_hainan[] = {
1589
1630
{ 0x0, 0x0000ffff, 0, 0x2d9, SISLANDS_CACCONFIG_CGIND },
1590
1631
{ 0x0, 0xffff0000, 16, 0x22b, SISLANDS_CACCONFIG_CGIND },
1591
1632
{ 0x1, 0x0000ffff, 0, 0x21c, SISLANDS_CACCONFIG_CGIND },
···
1648
1691
{ 0xFFFFFFFF }
1649
1692
};
1650
1693
1651
-
static const struct si_powertune_data powertune_data_hainan =
1652
-
{
1694
+
static const struct si_powertune_data powertune_data_hainan = {
1653
1695
((1 << 16) | 0x6993),
1654
1696
5,
1655
1697
0,