drm/i915/hdmi: use intel_de_wait_for_set() instead of wait_for()

Prefer the register read specific wait function over i915 wait_for().

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/c5d3044114b4464799a2fded18cda7946d95c4f6.1753956266.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 03045d188817e65169a1acd6cd7b1eebb7e080e9..cbee628eb26b71769b6a12c61a5fe12e4d13c565 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1582,9 +1582,9 @@ bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port,
        intel_de_write(display, HDCP_RPRIME(display, cpu_transcoder, port), ri.reg);
 
        /* Wait for Ri prime match */
-       if (wait_for((intel_de_read(display, HDCP_STATUS(display, cpu_transcoder, port)) &
-                     (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) ==
-                    (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
+       ret = intel_de_wait_for_set(display, HDCP_STATUS(display, cpu_transcoder, port),
+                                   HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC, 1);
+       if (ret) {
                drm_dbg_kms(display->drm, "Ri' mismatch detected (%x)\n",
                            intel_de_read(display, HDCP_STATUS(display, cpu_transcoder,
                                                               port)));