Skip to content

Commit 1e396bb

Browse files
committed
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: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20251110172756.2132-17-ville.syrjala@linux.intel.com Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com>
1 parent 7f8e976 commit 1e396bb

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,7 @@ void vlv_wait_port_ready(struct intel_encoder *encoder,
11731173
struct intel_display *display = to_intel_display(encoder);
11741174
u32 port_mask;
11751175
i915_reg_t dpll_reg;
1176+
u32 val;
11761177

11771178
switch (encoder->port) {
11781179
default:
@@ -1193,10 +1194,9 @@ void vlv_wait_port_ready(struct intel_encoder *encoder,
11931194
break;
11941195
}
11951196

1196-
if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, 1000, NULL))
1197+
if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, 1000, &val))
11971198
drm_WARN(display->drm, 1,
11981199
"timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",
11991200
encoder->base.base.id, encoder->base.name,
1200-
intel_de_read(display, dpll_reg) & port_mask,
1201-
expected_mask);
1201+
val & port_mask, expected_mask);
12021202
}

0 commit comments

Comments
 (0)