Commit 45d42485 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/tc: Move getting the power domain before reading DFLEX registers 



Move getting the required display power domain right before reading the
PORT_TX_DFLEXDPSP and PORT_TX_DFLEXPA1 registers, similarly to how this
is done while reading the other TCSS_DDI_STATUS PHY register.

Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Link: https://lore.kernel.org/r/20250805073700.642107-8-imre.deak@intel.com


Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
parent aaf01f66

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

+8 −10
Original line number Diff line number Diff line
@@ -269,8 +269,10 @@ static u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port) 
{

	struct intel_display *display = to_intel_display(dig_port);

	struct intel_tc_port *tc = to_tc_port(dig_port);

	intel_wakeref_t wakeref;

	u32 lane_mask;



	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)

		lane_mask = intel_de_read(display, PORT_TX_DFLEXDPSP(tc->phy_fia));



	drm_WARN_ON(display->drm, lane_mask == 0xffffffff);
@@ -284,8 +286,10 @@ u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port) 
{

	struct intel_display *display = to_intel_display(dig_port);

	struct intel_tc_port *tc = to_tc_port(dig_port);

	intel_wakeref_t wakeref;

	u32 pin_mask;



	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)

		pin_mask = intel_de_read(display, PORT_TX_DFLEXPA1(tc->phy_fia));



	drm_WARN_ON(display->drm, pin_mask == 0xffffffff);
@@ -324,11 +328,8 @@ static int lnl_tc_port_get_max_lane_count(struct intel_digital_port *dig_port) 


static int mtl_tc_port_get_max_lane_count(struct intel_digital_port *dig_port)

{

	struct intel_display *display = to_intel_display(dig_port);

	intel_wakeref_t wakeref;

	u32 pin_mask;



	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)

	pin_mask = intel_tc_port_get_pin_assignment_mask(dig_port);



	switch (pin_mask) {
@@ -345,11 +346,8 @@ static int mtl_tc_port_get_max_lane_count(struct intel_digital_port *dig_port) 


static int intel_tc_port_get_max_lane_count(struct intel_digital_port *dig_port)

{

	struct intel_display *display = to_intel_display(dig_port);

	intel_wakeref_t wakeref;

	u32 lane_mask = 0;



	with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)

	lane_mask = intel_tc_port_get_lane_mask(dig_port);



	switch (lane_mask) {