tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/dp: Convert drm_dp_helper.c to using drm_err/drm_dbg_*()

Now that we've added a back-pointer to drm_device to drm_dp_aux, made
drm_dp_aux available to any functions in drm_dp_helper.c which need to
print to the kernel log, and ensured all of our logging uses a consistent
format, let's do the final step of the conversion and actually move
everything over to using drm_err() and drm_dbg_*().

This was done by using the following cocci script:

@@
expression list expr;
@@

(
- DRM_DEBUG_KMS(expr);
+ drm_dbg_kms(aux->drm_dev, expr);
|
- DRM_DEBUG_DP(expr);
+ drm_dbg_dp(aux->drm_dev, expr);
|
- DRM_DEBUG_ATOMIC(expr);
+ drm_dbg_atomic(aux->drm_dev, expr);
|
- DRM_DEBUG_KMS_RATELIMITED(expr);
+ drm_dbg_kms_ratelimited(aux->drm_dev, expr);
|
- DRM_ERROR(expr);
+ drm_err(aux->drm_dev, expr);
)

Followed by correcting the resulting line-wrapping in the results by hand.

v2:
* Fix indenting in drm_dp_dump_access

Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-16-lyude@redhat.com
Reviewed-by: Dave Airlie <airlied@redhat.com>

Lyude Paul b1e7f5fd 79119021

+59 -62
+59 -62
drivers/gpu/drm/drm_dp_helper.c
··· 139 139 DP_TRAINING_AUX_RD_MASK; 140 140 141 141 if (rd_interval > 4) 142 - DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n", 143 - aux->name, rd_interval); 142 + drm_dbg_kms(aux->drm_dev, "%s: AUX interval %lu, out of range (max 4)\n", 143 + aux->name, rd_interval); 144 144 145 145 if (rd_interval == 0 || dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14) 146 146 rd_interval = 100; ··· 155 155 unsigned long rd_interval) 156 156 { 157 157 if (rd_interval > 4) 158 - DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n", 159 - aux->name, rd_interval); 158 + drm_dbg_kms(aux->drm_dev, "%s: AUX interval %lu, out of range (max 4)\n", 159 + aux->name, rd_interval); 160 160 161 161 if (rd_interval == 0) 162 162 rd_interval = 400; ··· 220 220 const char *arrow = request == DP_AUX_NATIVE_READ ? "->" : "<-"; 221 221 222 222 if (ret > 0) 223 - DRM_DEBUG_DP("%s: 0x%05x AUX %s (ret=%3d) %*ph\n", 224 - aux->name, offset, arrow, ret, min(ret, 20), buffer); 223 + drm_dbg_dp(aux->drm_dev, "%s: 0x%05x AUX %s (ret=%3d) %*ph\n", 224 + aux->name, offset, arrow, ret, min(ret, 20), buffer); 225 225 else 226 - DRM_DEBUG_DP("%s: 0x%05x AUX %s (ret=%3d)\n", 227 - aux->name, offset, arrow, ret); 226 + drm_dbg_dp(aux->drm_dev, "%s: 0x%05x AUX %s (ret=%3d)\n", 227 + aux->name, offset, arrow, ret); 228 228 } 229 229 230 230 /** ··· 287 287 err = ret; 288 288 } 289 289 290 - DRM_DEBUG_KMS("%s: Too many retries, giving up. First error: %d\n", 291 - aux->name, err); 290 + drm_dbg_kms(aux->drm_dev, "%s: Too many retries, giving up. First error: %d\n", 291 + aux->name, err); 292 292 ret = err; 293 293 294 294 unlock: ··· 524 524 525 525 if (drm_dp_dpcd_read(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, 526 526 &auto_test_req, 1) < 1) { 527 - DRM_ERROR("%s: DPCD failed read at register 0x%x\n", 528 - aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR); 527 + drm_err(aux->drm_dev, "%s: DPCD failed read at register 0x%x\n", 528 + aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR); 529 529 return false; 530 530 } 531 531 auto_test_req &= DP_AUTOMATED_TEST_REQUEST; 532 532 533 533 if (drm_dp_dpcd_read(aux, DP_TEST_REQUEST, &link_edid_read, 1) < 1) { 534 - DRM_ERROR("%s: DPCD failed read at register 0x%x\n", 535 - aux->name, DP_TEST_REQUEST); 534 + drm_err(aux->drm_dev, "%s: DPCD failed read at register 0x%x\n", 535 + aux->name, DP_TEST_REQUEST); 536 536 return false; 537 537 } 538 538 link_edid_read &= DP_TEST_LINK_EDID_READ; 539 539 540 540 if (!auto_test_req || !link_edid_read) { 541 - DRM_DEBUG_KMS("%s: Source DUT does not support TEST_EDID_READ\n", 542 - aux->name); 541 + drm_dbg_kms(aux->drm_dev, "%s: Source DUT does not support TEST_EDID_READ\n", 542 + aux->name); 543 543 return false; 544 544 } 545 545 546 546 if (drm_dp_dpcd_write(aux, DP_DEVICE_SERVICE_IRQ_VECTOR, 547 547 &auto_test_req, 1) < 1) { 548 - DRM_ERROR("%s: DPCD failed write at register 0x%x\n", 549 - aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR); 548 + drm_err(aux->drm_dev, "%s: DPCD failed write at register 0x%x\n", 549 + aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR); 550 550 return false; 551 551 } 552 552 553 553 /* send back checksum for the last edid extension block data */ 554 554 if (drm_dp_dpcd_write(aux, DP_TEST_EDID_CHECKSUM, 555 555 &real_edid_checksum, 1) < 1) { 556 - DRM_ERROR("%s: DPCD failed write at register 0x%x\n", 557 - aux->name, DP_TEST_EDID_CHECKSUM); 556 + drm_err(aux->drm_dev, "%s: DPCD failed write at register 0x%x\n", 557 + aux->name, DP_TEST_EDID_CHECKSUM); 558 558 return false; 559 559 } 560 560 561 561 test_resp |= DP_TEST_EDID_CHECKSUM_WRITE; 562 562 if (drm_dp_dpcd_write(aux, DP_TEST_RESPONSE, &test_resp, 1) < 1) { 563 - DRM_ERROR("%s: DPCD failed write at register 0x%x\n", 564 - aux->name, DP_TEST_RESPONSE); 563 + drm_err(aux->drm_dev, "%s: DPCD failed write at register 0x%x\n", 564 + aux->name, DP_TEST_RESPONSE); 565 565 return false; 566 566 } 567 567 ··· 604 604 return -EIO; 605 605 606 606 if (dpcd[DP_DPCD_REV] > dpcd_ext[DP_DPCD_REV]) { 607 - DRM_DEBUG_KMS("%s: Extended DPCD rev less than base DPCD rev (%d > %d)\n", 608 - aux->name, dpcd[DP_DPCD_REV], 609 - dpcd_ext[DP_DPCD_REV]); 607 + drm_dbg_kms(aux->drm_dev, 608 + "%s: Extended DPCD rev less than base DPCD rev (%d > %d)\n", 609 + aux->name, dpcd[DP_DPCD_REV], dpcd_ext[DP_DPCD_REV]); 610 610 return 0; 611 611 } 612 612 613 613 if (!memcmp(dpcd, dpcd_ext, sizeof(dpcd_ext))) 614 614 return 0; 615 615 616 - DRM_DEBUG_KMS("%s: Base DPCD: %*ph\n", 617 - aux->name, DP_RECEIVER_CAP_SIZE, dpcd); 616 + drm_dbg_kms(aux->drm_dev, "%s: Base DPCD: %*ph\n", aux->name, DP_RECEIVER_CAP_SIZE, dpcd); 618 617 619 618 memcpy(dpcd, dpcd_ext, sizeof(dpcd_ext)); 620 619 ··· 648 649 if (ret < 0) 649 650 return ret; 650 651 651 - DRM_DEBUG_KMS("%s: DPCD: %*ph\n", 652 - aux->name, DP_RECEIVER_CAP_SIZE, dpcd); 652 + drm_dbg_kms(aux->drm_dev, "%s: DPCD: %*ph\n", aux->name, DP_RECEIVER_CAP_SIZE, dpcd); 653 653 654 654 return ret; 655 655 } ··· 692 694 if (ret != len) 693 695 return -EIO; 694 696 695 - DRM_DEBUG_KMS("%s: DPCD DFP: %*ph\n", 696 - aux->name, len, downstream_ports); 697 + drm_dbg_kms(aux->drm_dev, "%s: DPCD DFP: %*ph\n", aux->name, len, downstream_ports); 697 698 698 699 return 0; 699 700 } ··· 1409 1412 * Avoid spamming the kernel log with timeout errors. 1410 1413 */ 1411 1414 if (ret == -ETIMEDOUT) 1412 - DRM_DEBUG_KMS_RATELIMITED("%s: transaction timed out\n", 1413 - aux->name); 1415 + drm_dbg_kms_ratelimited(aux->drm_dev, "%s: transaction timed out\n", 1416 + aux->name); 1414 1417 else 1415 - DRM_DEBUG_KMS("%s: transaction failed: %d\n", 1416 - aux->name, ret); 1418 + drm_dbg_kms(aux->drm_dev, "%s: transaction failed: %d\n", 1419 + aux->name, ret); 1417 1420 return ret; 1418 1421 } 1419 1422 ··· 1427 1430 break; 1428 1431 1429 1432 case DP_AUX_NATIVE_REPLY_NACK: 1430 - DRM_DEBUG_KMS("%s: native nack (result=%d, size=%zu)\n", 1431 - aux->name, ret, msg->size); 1433 + drm_dbg_kms(aux->drm_dev, "%s: native nack (result=%d, size=%zu)\n", 1434 + aux->name, ret, msg->size); 1432 1435 return -EREMOTEIO; 1433 1436 1434 1437 case DP_AUX_NATIVE_REPLY_DEFER: 1435 - DRM_DEBUG_KMS("%s: native defer\n", aux->name); 1438 + drm_dbg_kms(aux->drm_dev, "%s: native defer\n", aux->name); 1436 1439 /* 1437 1440 * We could check for I2C bit rate capabilities and if 1438 1441 * available adjust this interval. We could also be ··· 1446 1449 continue; 1447 1450 1448 1451 default: 1449 - DRM_ERROR("%s: invalid native reply %#04x\n", 1450 - aux->name, msg->reply); 1452 + drm_err(aux->drm_dev, "%s: invalid native reply %#04x\n", 1453 + aux->name, msg->reply); 1451 1454 return -EREMOTEIO; 1452 1455 } 1453 1456 ··· 1462 1465 return ret; 1463 1466 1464 1467 case DP_AUX_I2C_REPLY_NACK: 1465 - DRM_DEBUG_KMS("%s: I2C nack (result=%d, size=%zu)\n", 1466 - aux->name, ret, msg->size); 1468 + drm_dbg_kms(aux->drm_dev, "%s: I2C nack (result=%d, size=%zu)\n", 1469 + aux->name, ret, msg->size); 1467 1470 aux->i2c_nack_count++; 1468 1471 return -EREMOTEIO; 1469 1472 1470 1473 case DP_AUX_I2C_REPLY_DEFER: 1471 - DRM_DEBUG_KMS("%s: I2C defer\n", aux->name); 1474 + drm_dbg_kms(aux->drm_dev, "%s: I2C defer\n", aux->name); 1472 1475 /* DP Compliance Test 4.2.2.5 Requirement: 1473 1476 * Must have at least 7 retries for I2C defers on the 1474 1477 * transaction to pass this test ··· 1482 1485 continue; 1483 1486 1484 1487 default: 1485 - DRM_ERROR("%s: invalid I2C reply %#04x\n", 1486 - aux->name, msg->reply); 1488 + drm_err(aux->drm_dev, "%s: invalid I2C reply %#04x\n", 1489 + aux->name, msg->reply); 1487 1490 return -EREMOTEIO; 1488 1491 } 1489 1492 } 1490 1493 1491 - DRM_DEBUG_KMS("%s: Too many retries, giving up\n", aux->name); 1494 + drm_dbg_kms(aux->drm_dev, "%s: Too many retries, giving up\n", aux->name); 1492 1495 return -EREMOTEIO; 1493 1496 } 1494 1497 ··· 1517 1520 return err == 0 ? -EPROTO : err; 1518 1521 1519 1522 if (err < msg.size && err < ret) { 1520 - DRM_DEBUG_KMS("%s: Partial I2C reply: requested %zu bytes got %d bytes\n", 1521 - aux->name, msg.size, err); 1523 + drm_dbg_kms(aux->drm_dev, 1524 + "%s: Partial I2C reply: requested %zu bytes got %d bytes\n", 1525 + aux->name, msg.size, err); 1522 1526 ret = err; 1523 1527 } 1524 1528 ··· 1698 1700 } 1699 1701 1700 1702 if (ret == -EAGAIN) { 1701 - DRM_DEBUG_KMS("%s: Get CRC failed after retrying: %d\n", 1702 - aux->name, ret); 1703 + drm_dbg_kms(aux->drm_dev, "%s: Get CRC failed after retrying: %d\n", 1704 + aux->name, ret); 1703 1705 continue; 1704 1706 } else if (ret) { 1705 - DRM_DEBUG_KMS("%s: Failed to get a CRC: %d\n", 1706 - aux->name, ret); 1707 + drm_dbg_kms(aux->drm_dev, "%s: Failed to get a CRC: %d\n", aux->name, ret); 1707 1708 continue; 1708 1709 } 1709 1710 ··· 2006 2009 2007 2010 dev_id_len = strnlen(ident->device_id, sizeof(ident->device_id)); 2008 2011 2009 - DRM_DEBUG_KMS("%s: DP %s: OUI %*phD dev-ID %*pE HW-rev %d.%d SW-rev %d.%d quirks 0x%04x\n", 2010 - aux->name, is_branch ? "branch" : "sink", 2011 - (int)sizeof(ident->oui), ident->oui, 2012 - dev_id_len, ident->device_id, 2013 - ident->hw_rev >> 4, ident->hw_rev & 0xf, 2014 - ident->sw_major_rev, ident->sw_minor_rev, 2015 - desc->quirks); 2012 + drm_dbg_kms(aux->drm_dev, 2013 + "%s: DP %s: OUI %*phD dev-ID %*pE HW-rev %d.%d SW-rev %d.%d quirks 0x%04x\n", 2014 + aux->name, is_branch ? "branch" : "sink", 2015 + (int)sizeof(ident->oui), ident->oui, dev_id_len, 2016 + ident->device_id, ident->hw_rev >> 4, ident->hw_rev & 0xf, 2017 + ident->sw_major_rev, ident->sw_minor_rev, desc->quirks); 2016 2018 2017 2019 return 0; 2018 2020 } ··· 2777 2781 if (ret < 0) 2778 2782 return ret; 2779 2783 if (!(buf & DP_PCON_ENABLE_SOURCE_CTL_MODE)) { 2780 - DRM_DEBUG_KMS("%s: PCON in Autonomous mode, can't enable FRL\n", aux->name); 2784 + drm_dbg_kms(aux->drm_dev, "%s: PCON in Autonomous mode, can't enable FRL\n", 2785 + aux->name); 2781 2786 return -EINVAL; 2782 2787 } 2783 2788 buf |= DP_PCON_ENABLE_HDMI_LINK; ··· 2873 2876 num_error = 0; 2874 2877 } 2875 2878 2876 - DRM_ERROR("%s: More than %d errors since the last read for lane %d", 2877 - aux->name, num_error, i); 2879 + drm_err(aux->drm_dev, "%s: More than %d errors since the last read for lane %d", 2880 + aux->name, num_error, i); 2878 2881 } 2879 2882 } 2880 2883 EXPORT_SYMBOL(drm_dp_pcon_hdmi_frl_link_error_count);