Hey Lyude,
Thanks for the patch.
On Fri, 19 Feb 2021 at 23:03, Lyude Paul wrote:
>
> 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.
>
> Signed-off-by: Lyude Paul
> ---
> drivers/gpu/drm/drm_dp_helper.c | 122
> 1 file changed, 60 insertions(+), 62 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
> index b5e2671baf22..0a787ddf39fd 100644
> --- a/drivers/gpu/drm/drm_dp_helper.c
> +++ b/drivers/gpu/drm/drm_dp_helper.c
> @@ -139,8 +139,8 @@ void drm_dp_link_train_clock_recovery_delay(const struct
> drm_dp_aux *aux,
> DP_TRAINING_AUX_RD_MASK;
>
> if (rd_interval > 4)
> - DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n",
> - aux->name, rd_interval);
> + drm_dbg_kms(aux->drm_dev, "%s: AUX interval %lu, out of range
> (max 4)\n",
> + aux->name, rd_interval);
>
> if (rd_interval == 0 || dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14)
> rd_interval = 100;
> @@ -155,8 +155,8 @@ static void __drm_dp_link_train_channel_eq_delay(const
> struct drm_dp_aux *aux,
> unsigned long rd_interval)
> {
> if (rd_interval > 4)
> - DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n",
> - aux->name, rd_interval);
> + drm_dbg_kms(aux->drm_dev, "%s: AUX interval %lu, out of range
> (max 4)\n",
> + aux->name, rd_interval);
>
> if (rd_interval == 0)
> rd_interval = 400;
> @@ -220,11 +220,12 @@ drm_dp_dump_access(const struct drm_dp_aux *aux,
> const char *arrow = request == DP_AUX_NATIVE_READ ? "->" : "<-";
>
> if (ret > 0)
> - DRM_DEBUG_DP("%s: 0x%05x AUX %s (ret=%3d) %*ph\n",
> -aux->name, offset, arrow, ret, min(ret, 20),
> buffer);
> + drm_dbg_dp(aux->drm_dev, "%s: 0x%05x AUX %s (ret=%3d) %*ph\n",
> + aux->name, offset, arrow, ret, min(ret, 20),
> + buffer);
checkpatch --strict is unhappy with this chunk
ERROR: code indent should use tabs where possible
#75: FILE: drivers/gpu/drm/drm_dp_helper.c:224:
+^I^I aux->name, offset, arrow, ret, min(ret, 20),$
ERROR: code indent should use tabs where possible
#76: FILE: drivers/gpu/drm/drm_dp_helper.c:225:
> else
> - DRM_DEBUG_DP("%s: 0x%05x AUX %s (ret=%3d)\n",
> -aux->name, offset, arrow, ret);
> + drm_dbg_dp(aux->drm_dev, "%s: 0x%05x AUX %s (ret=%3d)\n",
> + aux->name, offset, arrow, ret);
checkpatch --strict is unhappy with this chunk
ERROR: code indent should use tabs where possible
#81: FILE: drivers/gpu/drm/drm_dp_helper.c:228:
+^I^I aux->name, offset, arrow, ret);$
> }
>
> /**
> @@ -287,8 +288,8 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8
> request,
> err = ret;
> }
>
> - DRM_DEBUG_KMS("%s: Too many retries, giving up. First error: %d\n",
> - aux->name, err);
> + drm_dbg_kms(aux->drm_dev, "%s: Too many retries, giving up. First
> error: %d\n",
> + aux->name, err);
> ret = err;
>
> unlock:
> @@ -524,44 +525,44 @@ bool drm_dp_send_real_edid_checksum(struct drm_dp_aux
> *aux,
>
> if (drm_dp_dpcd_read(aux, DP_DEVICE_SERVICE_IRQ_VECTOR,
> &auto_test_req, 1) < 1) {
> - DRM_ERROR("%s: DPCD failed read at register 0x%x\n",
> - aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR);
> + drm_err(aux->drm_dev, "%s: DPCD failed read at register
> 0x%x\n",
> + aux->name, DP_DEVICE_SERVICE_IRQ_VECTOR);
> return false;
> }
> auto_test_req &= DP_AUTOMATED_TEST_REQUEST;
>
> if (drm_dp_dpcd_read(aux, DP_TEST_REQUEST, &link_edid_read, 1) < 1) {
> - DRM_ER