]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/hdcp: Use the default 2 usec fast polling timeout
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 6 Nov 2025 15:20:48 +0000 (17:20 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 7 Nov 2025 18:29:43 +0000 (20:29 +0200)
For whatever unknown reason the HDCP code is using a custom
10 usec fast polling timeout instead of the normal 2 usec
value. Switch to the standard value to get rid of the special
case.

The eventual aim is to get rid of the fast vs. slow timeout
entirely and switch over to poll_timeout_us().

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251106152049.21115-10-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/display/intel_hdcp.c

index 7195e8cf671c611babbe5f370bc7730540d9e991..d01733b6460e667b4adccb3e2cb271dd6d341404 100644 (file)
@@ -412,7 +412,7 @@ static int intel_hdcp_load_keys(struct intel_display *display)
        /* Wait for the keys to load (500us) */
        ret = intel_de_wait_custom(display, HDCP_KEY_STATUS,
                                   HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE,
-                                  10, 1, &val);
+                                  2, 1, &val);
        if (ret)
                return ret;
        else if (!(val & HDCP_KEY_LOAD_STATUS))