]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/i915/dp: convert open-coded timeout to poll_timeout_us()
authorJani Nikula <jani.nikula@intel.com>
Fri, 29 Aug 2025 11:33:11 +0000 (14:33 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 3 Sep 2025 09:05:21 +0000 (12:05 +0300)
Use poll_timeout_us() instead of open-coding the timeout loop.

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://lore.kernel.org/r/20250829113311.1930618-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_dp.c

index bed7cba1ca688562fc33215a9241f1650b423c80..958e48859beb3922b710f2f462bae1866830dccc 100644 (file)
@@ -27,6 +27,7 @@
 
 #include <linux/export.h>
 #include <linux/i2c.h>
+#include <linux/iopoll.h>
 #include <linux/log2.h>
 #include <linux/math.h>
 #include <linux/notifier.h>
@@ -5662,14 +5663,9 @@ bool intel_digital_port_connected_locked(struct intel_encoder *encoder)
        intel_wakeref_t wakeref;
 
        with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref) {
-               unsigned long wait_expires = jiffies + msecs_to_jiffies_timeout(4);
-
-               do {
-                       is_connected = dig_port->connected(encoder);
-                       if (is_connected || is_glitch_free)
-                               break;
-                       usleep_range(10, 30);
-               } while (time_before(jiffies, wait_expires));
+               poll_timeout_us(is_connected = dig_port->connected(encoder),
+                               is_connected || is_glitch_free,
+                               30, 4000, false);
        }
 
        return is_connected;