1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index c8e611af408e..b50c03a3bfe6 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -150,6 +150,12 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
 
         dev_priv = intel_dig_port->base.base.dev->dev_private;
 
+        ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
+        if (ret) {
+                DRM_ERROR("KSV list failed to become ready (%d)\n", ret);
+                return ret;
+        }
+
         ret = shim->read_bstatus(intel_dig_port, bstatus);
         if (ret)
                 return ret;
@@ -161,12 +167,6 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
                 return 0;
         }
 
-        ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
-        if (ret) {
-                DRM_ERROR("KSV list failed to become ready (%d)\n", ret);
-                return ret;
-        }
-
         ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL);
         if (!ksv_fifo)
                 return -ENOMEM;