From: jsg <jsg@openbsd.org>
Date: Thu, 20 Jul 2023 09:00:58 +0000 (+0000)
Subject: drm/amd: Don't try to enable secure display TA multiple times
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9ee584c94c76226dd170bb78b9219f6110d60d1c;p=openbsd

drm/amd: Don't try to enable secure display TA multiple times

From Mario Limonciello
4033b47642c7e2956bb556f2dd953b5e9e47d927 in linux-6.1.y/6.1.39
5c6d52ff4b61e5267b25be714eb5a9ba2a338199 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
index c8c5c26942a..f003bef84a5 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_psp.c
@@ -1972,6 +1972,8 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
 		psp_securedisplay_parse_resp_status(psp, securedisplay_cmd->status);
 		dev_err(psp->adev->dev, "SECUREDISPLAY: query securedisplay TA failed. ret 0x%x\n",
 			securedisplay_cmd->securedisplay_out_message.query_ta.query_cmd_ret);
+		/* don't try again */
+		psp->securedisplay_context.context.bin_desc.size_bytes = 0;
 	}
 
 	return 0;