admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Include the AUX CH name in the debug messages

Browse Source 
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>
This commit is contained in:
Ville Syrjälä
2020-01-23 17:45:41 +02:00
parent ac0e331a62
commit 264c0247d8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/i915/display/intel_dp.c
View File

@@ -1193,7 +1193,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp)
if (!done) if (!done)
drm_err(&i915->drm, 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); intel_dp->aux.name, timeout_ms, status);
#undef C #undef C
@@ -1380,8 +1380,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
const u32 status = intel_uncore_read(uncore, ch_ctl); const u32 status = intel_uncore_read(uncore, ch_ctl);
if (status != intel_dp->aux_busy_last_status) { if (status != intel_dp->aux_busy_last_status) {
WARN(1, "dp_aux_ch not started status 0x%08x\n", WARN(1, "%s: not started (status 0x%08x)\n",
status); intel_dp->aux.name, status);
intel_dp->aux_busy_last_status = 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) { if ((status & DP_AUX_CH_CTL_DONE) == 0) {
drm_err(&i915->drm, "dp_aux_ch not done status 0x%08x\n", drm_err(&i915->drm, "%s: not done (status 0x%08x)\n",
status); intel_dp->aux.name, status);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
@@ -1453,8 +1453,8 @@ done:
* Timeouts occur when the sink is not connected * Timeouts occur when the sink is not connected
*/ */
if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) {
drm_err(&i915->drm, "dp_aux_ch receive error status 0x%08x\n", drm_err(&i915->drm, "%s: receive error (status 0x%08x)\n",
status); intel_dp->aux.name, status);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
@@ -1462,8 +1462,8 @@ done:
/* Timeouts occur when the device isn't connected, so they're /* Timeouts occur when the device isn't connected, so they're
* "normal" -- don't fill the kernel log with these */ * "normal" -- don't fill the kernel log with these */
if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) {
drm_dbg_kms(&i915->drm, "dp_aux_ch timeout status 0x%08x\n", drm_dbg_kms(&i915->drm, "%s: timeout (status 0x%08x)\n",
status); intel_dp->aux.name, status);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out; goto out;
} }
@@ -1479,8 +1479,8 @@ done:
*/ */
if (recv_bytes == 0 || recv_bytes > 20) { if (recv_bytes == 0 || recv_bytes > 20) {
drm_dbg_kms(&i915->drm, drm_dbg_kms(&i915->drm,
"Forbidden recv_bytes = %d on aux transaction\n", "%s: Forbidden recv_bytes = %d on aux transaction\n",
recv_bytes); intel_dp->aux.name, recv_bytes);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }