[PATCH 1/8] drm/i915/hdmi: use intel_de_wait_for_set() instead of wait_for()

[Jani Nikula]

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

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c 
b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 9961ff259298..8ba61259336e 100644
--- 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)));
-- 
2.39.5