From: Ville Syrjala <ville.syrjala@linux.intel.com> To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/3] drm/i915: Include the AUX CH name in the debug messages Date: Thu, 23 Jan 2020 17:45:41 +0200 [thread overview] Message-ID: <20200123154542.12271-2-ville.syrjala@linux.intel.com> (raw) In-Reply-To: <20200123154542.12271-1-ville.syrjala@linux.intel.com> From: Ville Syrjälä <ville.syrjala@linux.intel.com> To make it easier to figure out what caused a particular debug message let's print out aux->name. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 1795963e1866..941f0f6d55c1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1186,7 +1186,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); if (!done) - DRM_ERROR("%s did not complete or timeout within %ums (status 0x%08x)\n", + DRM_ERROR("%s: did not complete or timeout within %ums (status 0x%08x)\n", intel_dp->aux.name, timeout_ms, status); #undef C @@ -1373,8 +1373,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, const u32 status = intel_uncore_read(uncore, ch_ctl); if (status != intel_dp->aux_busy_last_status) { - WARN(1, "dp_aux_ch not started status 0x%08x\n", - status); + WARN(1, "%s: not started status 0x%08x\n", + intel_dp->aux.name, status); intel_dp->aux_busy_last_status = status; } @@ -1435,7 +1435,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, } if ((status & DP_AUX_CH_CTL_DONE) == 0) { - DRM_ERROR("dp_aux_ch not done status 0x%08x\n", status); + DRM_ERROR("%s: not done status 0x%08x\n", + intel_dp->aux.name, status); ret = -EBUSY; goto out; } @@ -1445,7 +1446,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, * Timeouts occur when the sink is not connected */ if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { - DRM_ERROR("dp_aux_ch receive error status 0x%08x\n", status); + DRM_ERROR("%s: receive error status 0x%08x\n", + intel_dp->aux.name, status); ret = -EIO; goto out; } @@ -1453,7 +1455,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, /* Timeouts occur when the device isn't connected, so they're * "normal" -- don't fill the kernel log with these */ if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { - DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); + DRM_DEBUG_KMS("%s: timeout status 0x%08x\n", + intel_dp->aux.name, status); ret = -ETIMEDOUT; goto out; } @@ -1468,8 +1471,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, * drm layer takes care for the necessary retries. */ if (recv_bytes == 0 || recv_bytes > 20) { - DRM_DEBUG_KMS("Forbidden recv_bytes = %d on aux transaction\n", - recv_bytes); + DRM_DEBUG_KMS("%s: Forbidden recv_bytes = %d on aux transaction\n", + intel_dp->aux.name, recv_bytes); ret = -EBUSY; goto out; } -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Ville Syrjala <ville.syrjala@linux.intel.com> To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Include the AUX CH name in the debug messages Date: Thu, 23 Jan 2020 17:45:41 +0200 [thread overview] Message-ID: <20200123154542.12271-2-ville.syrjala@linux.intel.com> (raw) In-Reply-To: <20200123154542.12271-1-ville.syrjala@linux.intel.com> From: Ville Syrjälä <ville.syrjala@linux.intel.com> To make it easier to figure out what caused a particular debug message let's print out aux->name. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 1795963e1866..941f0f6d55c1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1186,7 +1186,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); if (!done) - DRM_ERROR("%s did not complete or timeout within %ums (status 0x%08x)\n", + DRM_ERROR("%s: did not complete or timeout within %ums (status 0x%08x)\n", intel_dp->aux.name, timeout_ms, status); #undef C @@ -1373,8 +1373,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, const u32 status = intel_uncore_read(uncore, ch_ctl); if (status != intel_dp->aux_busy_last_status) { - WARN(1, "dp_aux_ch not started status 0x%08x\n", - status); + WARN(1, "%s: not started status 0x%08x\n", + intel_dp->aux.name, status); intel_dp->aux_busy_last_status = status; } @@ -1435,7 +1435,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, } if ((status & DP_AUX_CH_CTL_DONE) == 0) { - DRM_ERROR("dp_aux_ch not done status 0x%08x\n", status); + DRM_ERROR("%s: not done status 0x%08x\n", + intel_dp->aux.name, status); ret = -EBUSY; goto out; } @@ -1445,7 +1446,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, * Timeouts occur when the sink is not connected */ if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { - DRM_ERROR("dp_aux_ch receive error status 0x%08x\n", status); + DRM_ERROR("%s: receive error status 0x%08x\n", + intel_dp->aux.name, status); ret = -EIO; goto out; } @@ -1453,7 +1455,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, /* Timeouts occur when the device isn't connected, so they're * "normal" -- don't fill the kernel log with these */ if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { - DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); + DRM_DEBUG_KMS("%s: timeout status 0x%08x\n", + intel_dp->aux.name, status); ret = -ETIMEDOUT; goto out; } @@ -1468,8 +1471,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, * drm layer takes care for the necessary retries. */ if (recv_bytes == 0 || recv_bytes > 20) { - DRM_DEBUG_KMS("Forbidden recv_bytes = %d on aux transaction\n", - recv_bytes); + DRM_DEBUG_KMS("%s: Forbidden recv_bytes = %d on aux transaction\n", + intel_dp->aux.name, recv_bytes); ret = -EBUSY; goto out; } -- 2.24.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-01-23 15:45 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-23 15:45 [PATCH 1/3] drm/dp: Include the AUX CH name in the debug messages Ville Syrjala 2020-01-23 15:45 ` [Intel-gfx] " Ville Syrjala 2020-01-23 15:45 ` Ville Syrjala [this message] 2020-01-23 15:45 ` [Intel-gfx] [PATCH 2/3] drm/i915: " Ville Syrjala 2020-01-23 17:19 ` Matt Roper 2020-01-23 17:19 ` [Intel-gfx] " Matt Roper 2020-01-27 16:08 ` Ville Syrjälä 2020-01-27 16:08 ` [Intel-gfx] " Ville Syrjälä 2020-01-23 15:45 ` [PATCH 3/3] drm/i915: Give aux channels a better name Ville Syrjala 2020-01-23 15:45 ` [Intel-gfx] " Ville Syrjala 2020-01-23 17:22 ` Matt Roper 2020-01-23 17:22 ` Matt Roper 2020-01-24 2:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/3] drm/dp: Include the AUX CH name in the debug messages Patchwork 2020-01-25 20:19 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200123154542.12271-2-ville.syrjala@linux.intel.com \ --to=ville.syrjala@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.