Commit 50101556 authored Nov 06, 2025 by Ville Syrjälä

drm/i915/cx0: Replace XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US with...


drm/i915/cx0: Replace XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US with XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS

There was a completely unjustified change to the cx0 powerdown
timeout, and the way it was done now prevents future conversion
to poll_timeout_us().

Assuming there was some reason the bigger timeout let's nuke
the old short timeout (XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US)
nd replace it with the bigger timeout
(XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS).

For consistency with intel_wait_for_register() we'll stick to the
default 2 usec for the fast timeout.

v2: Go for the longer (ms) timeout in case it actually matters
v3: Note the defaullt 2 usec fast timeout (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251106152049.21115-5-ville.syrjala@linux.intel.com


Reviewed-by: Jani Nikula <jani.nikula@intel.com>

parent dfd58249

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2830,7 +2830,7 @@ void intel_cx0_powerdown_change_sequence(struct intel_encoder *encoder,
		/* Update Timeout Value */
		if (intel_de_wait_custom(display, buf_ctl2_reg,
		intel_cx0_get_powerdown_update(lane_mask), 0,
		XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US, 2, NULL))
		2, XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS, NULL))
		drm_warn(display->drm,
		"PHY %c failed to bring out of lane reset\n",
		phy_name(phy));

drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@
		#define XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US 20
		#define XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US 100
		#define XELPDP_PORT_RESET_START_TIMEOUT_US 5
		#define XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US 100
		#define XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS 2
		#define XELPDP_PORT_RESET_END_TIMEOUT 15
		#define XELPDP_REFCLK_ENABLE_TIMEOUT_US 1