Skip to content

Commit 6be05d5

Browse files
committed
drm/i915/de: Use intel_de_wait_for_{set,clear}_ms()
Use intel_de_wait_for_{set,clear}_ms() instead of intel_de_wait_ms() where appropriate. Done with cocci (with manual formatting fixes): @@ identifier func !~ "intel_de_wait_for"; expression display, reg, mask, timeout_ms; @@ func(...) { <... ( - intel_de_wait_ms(display, reg, mask, mask, timeout_ms, NULL) + intel_de_wait_for_set_ms(display, reg, mask, timeout_ms) | - intel_de_wait_ms(display, reg, mask, 0, timeout_ms, NULL) + intel_de_wait_for_clear_ms(display, reg, mask, timeout_ms) ) ...> } Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20251110172756.2132-11-ville.syrjala@linux.intel.com Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com>
1 parent 0aed9d3 commit 6be05d5

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,9 +2826,9 @@ void intel_cx0_powerdown_change_sequence(struct intel_encoder *encoder,
28262826
intel_cx0_get_powerdown_update(lane_mask));
28272827

28282828
/* Update Timeout Value */
2829-
if (intel_de_wait_ms(display, buf_ctl2_reg,
2830-
intel_cx0_get_powerdown_update(lane_mask), 0,
2831-
XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS, NULL))
2829+
if (intel_de_wait_for_clear_ms(display, buf_ctl2_reg,
2830+
intel_cx0_get_powerdown_update(lane_mask),
2831+
XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS))
28322832
drm_warn(display->drm,
28332833
"PHY %c failed to bring out of lane reset\n",
28342834
phy_name(phy));

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,9 +1201,9 @@ intel_lt_phy_lane_reset(struct intel_encoder *encoder,
12011201
XELPDP_LANE_PCLK_PLL_REQUEST(0),
12021202
XELPDP_LANE_PCLK_PLL_REQUEST(0));
12031203

1204-
if (intel_de_wait_ms(display, XELPDP_PORT_CLOCK_CTL(display, port),
1205-
XELPDP_LANE_PCLK_PLL_ACK(0), XELPDP_LANE_PCLK_PLL_ACK(0),
1206-
XE3PLPD_MACCLK_TURNON_LATENCY_MS, NULL))
1204+
if (intel_de_wait_for_set_ms(display, XELPDP_PORT_CLOCK_CTL(display, port),
1205+
XELPDP_LANE_PCLK_PLL_ACK(0),
1206+
XE3PLPD_MACCLK_TURNON_LATENCY_MS))
12071207
drm_warn(display->drm, "PHY %c PLL MacCLK assertion ack not done\n",
12081208
phy_name(phy));
12091209

@@ -1214,15 +1214,15 @@ intel_lt_phy_lane_reset(struct intel_encoder *encoder,
12141214
intel_de_rmw(display, XELPDP_PORT_BUF_CTL2(display, port),
12151215
lane_pipe_reset | lane_phy_pulse_status, 0);
12161216

1217-
if (intel_de_wait_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
1218-
lane_phy_current_status, 0,
1219-
XE3PLPD_RESET_END_LATENCY_MS, NULL))
1217+
if (intel_de_wait_for_clear_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
1218+
lane_phy_current_status,
1219+
XE3PLPD_RESET_END_LATENCY_MS))
12201220
drm_warn(display->drm, "PHY %c failed to bring out of lane reset\n",
12211221
phy_name(phy));
12221222

1223-
if (intel_de_wait_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
1224-
lane_phy_pulse_status, lane_phy_pulse_status,
1225-
XE3PLPD_RATE_CALIB_DONE_LATENCY_MS, NULL))
1223+
if (intel_de_wait_for_set_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
1224+
lane_phy_pulse_status,
1225+
XE3PLPD_RATE_CALIB_DONE_LATENCY_MS))
12261226
drm_warn(display->drm, "PHY %c PLL rate not changed\n",
12271227
phy_name(phy));
12281228

@@ -2001,9 +2001,9 @@ void intel_lt_phy_pll_enable(struct intel_encoder *encoder,
20012001
XELPDP_LANE_PCLK_PLL_REQUEST(0));
20022002

20032003
/* 12. Poll for PORT_CLOCK_CTL[PCLK PLL Ack LN0]= 1. */
2004-
if (intel_de_wait_ms(display, XELPDP_PORT_CLOCK_CTL(display, port),
2005-
XELPDP_LANE_PCLK_PLL_ACK(0), XELPDP_LANE_PCLK_PLL_ACK(0),
2006-
XE3PLPD_MACCLK_TURNON_LATENCY_MS, NULL))
2004+
if (intel_de_wait_for_set_ms(display, XELPDP_PORT_CLOCK_CTL(display, port),
2005+
XELPDP_LANE_PCLK_PLL_ACK(0),
2006+
XE3PLPD_MACCLK_TURNON_LATENCY_MS))
20072007
drm_warn(display->drm, "PHY %c PLL MacCLK ack assertion timeout\n",
20082008
phy_name(phy));
20092009

@@ -2029,9 +2029,9 @@ void intel_lt_phy_pll_enable(struct intel_encoder *encoder,
20292029
rate_update, MB_WRITE_COMMITTED);
20302030

20312031
/* 16. Poll for PORT_BUF_CTL2 register PHY Pulse Status = 1 for Owned PHY Lanes. */
2032-
if (intel_de_wait_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
2033-
lane_phy_pulse_status, lane_phy_pulse_status,
2034-
XE3PLPD_RATE_CALIB_DONE_LATENCY_MS, NULL))
2032+
if (intel_de_wait_for_set_ms(display, XELPDP_PORT_BUF_CTL2(display, port),
2033+
lane_phy_pulse_status,
2034+
XE3PLPD_RATE_CALIB_DONE_LATENCY_MS))
20352035
drm_warn(display->drm, "PHY %c PLL rate not changed\n",
20362036
phy_name(phy));
20372037

0 commit comments

Comments
 (0)