Commit 1e396bbf authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/dpio: Use the intel_de_wait_ms() out value 



Utilize the 'out_value' output parameter of intel_de_wait_ms()
instead of re-reading the DPLL/DPIO_PHY_STATUS register after
polling has finished.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251110172756.2132-17-ville.syrjala@linux.intel.com


Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 7f8e9767

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

+3 −3
Original line number Diff line number Diff line
@@ -1173,6 +1173,7 @@ void vlv_wait_port_ready(struct intel_encoder *encoder, 
	struct intel_display *display = to_intel_display(encoder);

	u32 port_mask;

	i915_reg_t dpll_reg;

	u32 val;



	switch (encoder->port) {

	default:
@@ -1193,10 +1194,9 @@ void vlv_wait_port_ready(struct intel_encoder *encoder, 
		break;

	}



	if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, 1000, NULL))

	if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, 1000, &val))

		drm_WARN(display->drm, 1,

			 "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",

			 encoder->base.base.id, encoder->base.name,

			 intel_de_read(display, dpll_reg) & port_mask,

			 expected_mask);

			 val & port_mask, expected_mask);

}