diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-01-23 17:45:41 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-01-27 18:02:59 +0200 |
| commit | 264c0247d8889124ec8aa08b03cc2bdb2544e249 (patch) | |
| tree | dcce8907ebe931c129d3f4668cd7d9ba54b0d0f9 /drivers | |
| parent | ac0e331a628b5ded087eab09fad2ffb082ac61ba (diff) | |
drm/i915: Include the AUX CH name in the debug messages
To make it easier to figure out what caused a particular debug
message let's print out aux->name.
v2: Rebase for drm_err() & co.
Add some punctuation to the messages (Matt)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123154542.12271-2-ville.syrjala@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index d82827f7f58b..96c2c3420c94 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1193,7 +1193,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) if (!done) drm_err(&i915->drm, - "%s did not complete or timeout within %ums (status 0x%08x)\n", + "%s: did not complete or timeout within %ums (status 0x%08x)\n", intel_dp->aux.name, timeout_ms, status); #undef C @@ -1380,8 +1380,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; } @@ -1442,8 +1442,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, } if ((status & DP_AUX_CH_CTL_DONE) == 0) { - drm_err(&i915->drm, "dp_aux_ch not done status 0x%08x\n", - status); + drm_err(&i915->drm, "%s: not done (status 0x%08x)\n", + intel_dp->aux.name, status); ret = -EBUSY; goto out; } @@ -1453,8 +1453,8 @@ done: * Timeouts occur when the sink is not connected */ if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { - drm_err(&i915->drm, "dp_aux_ch receive error status 0x%08x\n", - status); + drm_err(&i915->drm, "%s: receive error (status 0x%08x)\n", + intel_dp->aux.name, status); ret = -EIO; goto out; } @@ -1462,8 +1462,8 @@ done: /* 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_dbg_kms(&i915->drm, "dp_aux_ch timeout status 0x%08x\n", - status); + drm_dbg_kms(&i915->drm, "%s: timeout (status 0x%08x)\n", + intel_dp->aux.name, status); ret = -ETIMEDOUT; goto out; } @@ -1479,8 +1479,8 @@ done: */ if (recv_bytes == 0 || recv_bytes > 20) { drm_dbg_kms(&i915->drm, - "Forbidden recv_bytes = %d on aux transaction\n", - recv_bytes); + "%s: Forbidden recv_bytes = %d on aux transaction\n", + intel_dp->aux.name, recv_bytes); ret = -EBUSY; goto out; } |