drm/i915: Include the AUX CH name in the debug messages (264c0247) · Commits · 戴 / test

drivers/gpu/drm/i915/display/intel_dp.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message