From: jsg <jsg@openbsd.org>
Date: Fri, 18 Oct 2024 00:02:32 +0000 (+0000)
Subject: drm/amd/display: Revert "Check HDCP returned status"
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c11f96349fa4c5fa2052ee76980ebcb13164f183;p=openbsd

drm/amd/display: Revert "Check HDCP returned status"

From Alex Hung
939b4b2c008d4c620b8127bfd12cb22e40447141 in linux-6.6.y/6.6.57
bc2fe69f16c7122b5dabc294aa2d6065d8da2169 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c b/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
index b7da7037fe0..cee5e9e64ae 100644
--- a/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
+++ b/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
@@ -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;
 }