drm/i915/hdmi: use generic poll_timeout_us() instead of __wait_for()

Prefer generic poll helpers over i915 custom helpers.

The functional change is losing the exponentially growing sleep of
__wait_for(), which used to be 1, 2, 4, and 8 ms in this particular
case.

Use an arbitrary constant 4 ms sleep instead. The timeout remains,
varying between 20 ms and 3000 ms.

Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://lore.kernel.org/r/fc3a67f9de0049f415a276bba1c11a4df97e01d6.1756383233.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 0a8af7bb80ef4797e5482e842c640e7e5613d542..4ab7e2e3bfd42c9ff77770a9759a28080d198483 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/hdmi.h>
 #include <linux/i2c.h>
+#include <linux/iopoll.h>
 #include <linux/slab.h>
 #include <linux/string_helpers.h>
 
@@ -1690,11 +1691,10 @@ intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *dig_port,
        if (timeout < 0)
                return timeout;
 
-       ret = __wait_for(ret = hdcp2_detect_msg_availability(dig_port,
-                                                            msg_id, &msg_ready,
-                                                            &msg_sz),
-                        !ret && msg_ready && msg_sz, timeout * 1000,
-                        1000, 5 * 1000);
+       ret = poll_timeout_us(ret = hdcp2_detect_msg_availability(dig_port, msg_id,
+                                                                 &msg_ready, &msg_sz),
+                             !ret && msg_ready && msg_sz,
+                             4000, timeout * 1000, false);
        if (ret)
                drm_dbg_kms(display->drm,
                            "msg_id: %d, ret: %d, timeout: %d\n",