Commit 68b87ef2 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display/adl_p: Drop earlier return in tc_has_modular_fia() 



MODULAR_FIA_MASK is set in adl_p so we can drop this ealier return
and read registers.
Also to avoid warnings from icl_tc_port_assert_ref_held() when
calling tc_cold_block() in this functions it is necessary to held the
lock.

Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarClint Taylor <Clinton.A.Taylor@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210524214805.259692-1-jose.souza@intel.com
parent 0f926e5c

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

+2 −4
Original line number Diff line number Diff line
@@ -734,13 +734,11 @@ tc_has_modular_fia(struct drm_i915_private *i915, struct intel_digital_port *dig 
	if (!INTEL_INFO(i915)->display.has_modular_fia)

		return false;



	/* TODO: check if in real HW MODULAR_FIA_MASK is set, if so remove this block */

	if (IS_ALDERLAKE_P(i915))

		return true;



	mutex_lock(&dig_port->tc_lock);

	wakeref = tc_cold_block(dig_port);

	val = intel_uncore_read(&i915->uncore, PORT_TX_DFLEXDPSP(FIA1));

	tc_cold_unblock(dig_port, wakeref);

	mutex_unlock(&dig_port->tc_lock);



	drm_WARN_ON(&i915->drm, val == 0xffffffff);