Re: [PATCH 2/3] drm/i915: Include the AUX CH name in the debug messages

On Thu, Jan 23, 2020 at 05:45:41PM +0200, Ville Syrjala wrote:

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

It might be worth adding commas to some of these messages too while we're at it (e.g., "not started, status"). But either way, this is a really helpful cleanup.

Reviewed-by: Matt Roper matthew.d.roper@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