Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amd/display: Fix DPMS log printing
[Why]
Spaces before newline are not necessary. Inserting newlines in
multi-line strings are harder to follow when tracing messages.
[How]
Drop extra new lines and split multi-line messages into one print
per line.
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Mario Limonciello (AMD)
and committed by
Alex Deucher
217737bb
fe4d3987
+29
-89
+29
-89
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
+29
-89
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
···
1330
1330
}
1331
1331
}
1332
1332
1333
+
static void print_mst_streams(struct dc_link *link)
1334
+
{
1335
+
int i;
1336
+
1337
+
DC_LOGGER_INIT(link->ctx->logger);
1338
+
1339
+
DC_LOG_MST("%s stream_count: %d:\n",
1340
+
__func__,
1341
+
link->mst_stream_alloc_table.stream_count);
1342
+
1343
+
for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
1344
+
DC_LOG_MST("stream_enc[%d]: %p\n", i,
1345
+
(void *) link->mst_stream_alloc_table.stream_allocations[i].stream_enc);
1346
+
DC_LOG_MST("stream[%d].hpo_dp_stream_enc: %p\n", i,
1347
+
(void *) link->mst_stream_alloc_table.stream_allocations[i].hpo_dp_stream_enc);
1348
+
DC_LOG_MST("stream[%d].vcp_id: %d\n", i,
1349
+
link->mst_stream_alloc_table.stream_allocations[i].vcp_id);
1350
+
DC_LOG_MST("stream[%d].slot_count: %d\n", i,
1351
+
link->mst_stream_alloc_table.stream_allocations[i].slot_count);
1352
+
}
1353
+
}
1354
+
1333
1355
static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx)
1334
1356
{
1335
1357
struct dc_stream_state *stream = pipe_ctx->stream;
1336
1358
struct dc_link *link = stream->link;
1337
1359
struct dc_dp_mst_stream_allocation_table proposed_table = {0};
1338
1360
struct fixed31_32 avg_time_slots_per_mtp = dc_fixpt_from_int(0);
1339
-
int i;
1340
1361
bool mst_mode = (link->type == dc_connection_mst_branch);
1341
1362
const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
1342
1363
const struct dc_link_settings empty_link_settings = {0};
···
1393
1372
pipe_ctx->stream_res.hpo_dp_stream_enc,
1394
1373
&proposed_table);
1395
1374
else
1396
-
DC_LOG_WARNING("Failed to update"
1397
-
"MST allocation table for"
1398
-
"pipe idx:%d\n",
1375
+
DC_LOG_WARNING("Failed to update MST allocation table for idx %d\n",
1399
1376
pipe_ctx->pipe_idx);
1400
1377
} else {
1401
1378
/* when link is no longer in mst mode (mst hub unplugged),
···
1403
1384
pipe_ctx->stream_res.hpo_dp_stream_enc);
1404
1385
}
1405
1386
1406
-
DC_LOG_MST("%s"
1407
-
"stream_count: %d: ",
1408
-
__func__,
1409
-
link->mst_stream_alloc_table.stream_count);
1410
-
1411
-
for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
1412
-
DC_LOG_MST("stream_enc[%d]: %p "
1413
-
"stream[%d].hpo_dp_stream_enc: %p "
1414
-
"stream[%d].vcp_id: %d "
1415
-
"stream[%d].slot_count: %d\n",
1416
-
i,
1417
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].stream_enc,
1418
-
i,
1419
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].hpo_dp_stream_enc,
1420
-
i,
1421
-
link->mst_stream_alloc_table.stream_allocations[i].vcp_id,
1422
-
i,
1423
-
link->mst_stream_alloc_table.stream_allocations[i].slot_count);
1424
-
}
1387
+
print_mst_streams(link);
1425
1388
1426
1389
/* update mst stream allocation table hardware state */
1427
1390
if (link_hwss->ext.update_stream_allocation_table == NULL ||
···
1438
1437
struct fixed31_32 avg_time_slots_per_mtp;
1439
1438
struct fixed31_32 pbn;
1440
1439
struct fixed31_32 pbn_per_slot;
1441
-
int i;
1442
1440
enum act_return_status ret;
1443
1441
const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
1444
1442
DC_LOGGER_INIT(link->ctx->logger);
···
1459
1459
pipe_ctx->stream_res.hpo_dp_stream_enc,
1460
1460
&proposed_table);
1461
1461
else
1462
-
DC_LOG_WARNING("Failed to update"
1463
-
"MST allocation table for"
1464
-
"pipe idx:%d\n",
1462
+
DC_LOG_WARNING("Failed to update MST allocation table for idx %d\n",
1465
1463
pipe_ctx->pipe_idx);
1466
1464
1467
-
DC_LOG_MST("%s "
1468
-
"stream_count: %d: \n ",
1469
-
__func__,
1470
-
link->mst_stream_alloc_table.stream_count);
1471
-
1472
-
for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
1473
-
DC_LOG_MST("stream_enc[%d]: %p "
1474
-
"stream[%d].hpo_dp_stream_enc: %p "
1475
-
"stream[%d].vcp_id: %d "
1476
-
"stream[%d].slot_count: %d\n",
1477
-
i,
1478
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].stream_enc,
1479
-
i,
1480
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].hpo_dp_stream_enc,
1481
-
i,
1482
-
link->mst_stream_alloc_table.stream_allocations[i].vcp_id,
1483
-
i,
1484
-
link->mst_stream_alloc_table.stream_allocations[i].slot_count);
1485
-
}
1465
+
print_mst_streams(link);
1486
1466
1487
1467
ASSERT(proposed_table.stream_count > 0);
1488
1468
···
1727
1747
struct fixed31_32 pbn;
1728
1748
struct fixed31_32 pbn_per_slot;
1729
1749
struct dc_dp_mst_stream_allocation_table proposed_table = {0};
1730
-
uint8_t i;
1731
1750
const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
1732
1751
DC_LOGGER_INIT(link->ctx->logger);
1733
1752
···
1760
1781
pipe_ctx->stream_res.hpo_dp_stream_enc,
1761
1782
&proposed_table);
1762
1783
} else {
1763
-
DC_LOG_WARNING("Failed to update"
1764
-
"MST allocation table for"
1765
-
"pipe idx:%d\n",
1784
+
DC_LOG_WARNING("Failed to update MST allocation table for idx %d\n",
1766
1785
pipe_ctx->pipe_idx);
1767
1786
}
1768
1787
1769
-
DC_LOG_MST("%s "
1770
-
"stream_count: %d: \n ",
1771
-
__func__,
1772
-
link->mst_stream_alloc_table.stream_count);
1773
-
1774
-
for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
1775
-
DC_LOG_MST("stream_enc[%d]: %p "
1776
-
"stream[%d].hpo_dp_stream_enc: %p "
1777
-
"stream[%d].vcp_id: %d "
1778
-
"stream[%d].slot_count: %d\n",
1779
-
i,
1780
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].stream_enc,
1781
-
i,
1782
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].hpo_dp_stream_enc,
1783
-
i,
1784
-
link->mst_stream_alloc_table.stream_allocations[i].vcp_id,
1785
-
i,
1786
-
link->mst_stream_alloc_table.stream_allocations[i].slot_count);
1787
-
}
1788
+
print_mst_streams(link);
1788
1789
1789
1790
ASSERT(proposed_table.stream_count > 0);
1790
1791
···
1794
1835
struct fixed31_32 pbn;
1795
1836
struct fixed31_32 pbn_per_slot;
1796
1837
struct dc_dp_mst_stream_allocation_table proposed_table = {0};
1797
-
uint8_t i;
1798
1838
enum act_return_status ret;
1799
1839
const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
1800
1840
DC_LOGGER_INIT(link->ctx->logger);
···
1812
1854
&proposed_table);
1813
1855
}
1814
1856
1815
-
DC_LOG_MST("%s "
1816
-
"stream_count: %d: \n ",
1817
-
__func__,
1818
-
link->mst_stream_alloc_table.stream_count);
1819
-
1820
-
for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
1821
-
DC_LOG_MST("stream_enc[%d]: %p "
1822
-
"stream[%d].hpo_dp_stream_enc: %p "
1823
-
"stream[%d].vcp_id: %d "
1824
-
"stream[%d].slot_count: %d\n",
1825
-
i,
1826
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].stream_enc,
1827
-
i,
1828
-
(void *) link->mst_stream_alloc_table.stream_allocations[i].hpo_dp_stream_enc,
1829
-
i,
1830
-
link->mst_stream_alloc_table.stream_allocations[i].vcp_id,
1831
-
i,
1832
-
link->mst_stream_alloc_table.stream_allocations[i].slot_count);
1833
-
}
1857
+
print_mst_streams(link);
1834
1858
1835
1859
ASSERT(proposed_table.stream_count > 0);
1836
1860