Commit 5861258c authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/dp: Initialize the source OUI write timestamp always 



If the source OUI DPCD register value matches the expected Intel OUI
value, the write timestamp doesn't get updated leaving it at the 0
initial value if the OUI wasn't written before. This can lead to an
incorrect wait duration in intel_dp_wait_source_oui(), since jiffies is
not inited to 0 in general (on a 32 bit system INITIAL_JIFFIES is set to
5 minutes ahead of wrap-around). Fix this by intializing the write
timestamp in the above case as well.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241025160259.3088727-4-imre.deak@intel.com
parent afc73333

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

+4 −1
Original line number Diff line number Diff line
@@ -3418,9 +3418,12 @@ intel_edp_init_source_oui(struct intel_dp *intel_dp, bool careful) 
		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");



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

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

			/* Assume the OUI was written now. */

			intel_dp->last_oui_write = jiffies;

			return;

		}

	}



	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");