]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/dpio: Use the intel_de_wait_ms() out value
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 10 Nov 2025 17:27:55 +0000 (19:27 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 11 Nov 2025 17:36:09 +0000 (19:36 +0200)
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>
drivers/gpu/drm/i915/display/intel_dpio_phy.c

index 7b7a0461da369dc25cd873008ceb9fee89fce3f6..8027bab2951bd9c68505c337dc480481decf7bac 100644 (file)
@@ -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);
 }