]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amd/display: Revert "Check HDCP returned status"
authorAlex Hung <alex.hung@amd.com>
Tue, 25 Jun 2024 19:06:43 +0000 (13:06 -0600)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 23 Jul 2024 21:07:10 +0000 (17:07 -0400)
This reverts commit 5d93060d430b359e16e7c555c8f151ead1ac614b due to a
power consumption regression.

Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Jerry Zuo <jerry.zuo@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c

index 1e495e88448421f17f0d198ce732fa979ec237e2..8bc377560787bf8dd7291452f5622f1a7f0000be 100644 (file)
@@ -432,18 +432,18 @@ static enum mod_hdcp_status authenticated_dp(struct mod_hdcp *hdcp,
                goto out;
        }
 
-       if (!mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
+       mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
                        &input->bstatus_read, &status,
-                       hdcp, "bstatus_read"))
-               goto out;
-       if (!mod_hdcp_execute_and_set(check_link_integrity_dp,
+                       hdcp, "bstatus_read");
+
+       mod_hdcp_execute_and_set(check_link_integrity_dp,
                        &input->link_integrity_check, &status,
-                       hdcp, "link_integrity_check"))
-               goto out;
-       if (!mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
+                       hdcp, "link_integrity_check");
+
+       mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
                        &input->reauth_request_check, &status,
-                       hdcp, "reauth_request_check"))
-               goto out;
+                       hdcp, "reauth_request_check");
+
 out:
        return status;
 }