Commit b08d1274 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dp: demote source OUI read/write failure logging to debug 

Commit 1f12d63a ("drm/i915/dp: Write the source OUI for non-eDP
sinks as well") started writing source OUI for non-eDP sinks as well,
increasing the possibilities of hitting read/write failures either due
to the sink behaviour or hotplug or whatever.

Even before that, commit 3fb0501f ("drm/i915/display/dp: Reduce log
level for SOURCE OUI write failures") already reduced write failures to
info level when source OUI was just for eDP.

Further reduce the log level to just debug. Switch to struct
intel_display while at it.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3372


Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241106162325.4065078-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 34796ce4

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

+3 −3
Original line number Diff line number Diff line
@@ -3432,7 +3432,7 @@ void intel_dp_sink_disable_decompression(struct intel_atomic_state *state, 
static void

intel_dp_init_source_oui(struct intel_dp *intel_dp)

{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	struct intel_display *display = to_intel_display(intel_dp);

	u8 oui[] = { 0x00, 0xaa, 0x01 };

	u8 buf[3] = {};
@@ -3446,7 +3446,7 @@ intel_dp_init_source_oui(struct intel_dp *intel_dp) 
	 * already set to what we want, so as to avoid clearing any state by accident

	 */

	if (drm_dp_dpcd_read(&intel_dp->aux, DP_SOURCE_OUI, buf, sizeof(buf)) < 0)

		drm_err(&i915->drm, "Failed to read source OUI\n");

		drm_dbg_kms(display->drm, "Failed to read source OUI\n");



	if (memcmp(oui, buf, sizeof(oui)) == 0) {

		/* Assume the OUI was written now. */
@@ -3455,7 +3455,7 @@ intel_dp_init_source_oui(struct intel_dp *intel_dp) 
	}



	if (drm_dp_dpcd_write(&intel_dp->aux, DP_SOURCE_OUI, oui, sizeof(oui)) < 0) {

		drm_info(&i915->drm, "Failed to write source OUI\n");

		drm_dbg_kms(display->drm, "Failed to write source OUI\n");

		WRITE_ONCE(intel_dp->oui_valid, false);

	}