From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 27 Feb 2020 12:21:07 +0000 (+0100)
Subject: drop queue-5.5/drm-amd-display-fix-dtm-unloading.patch
X-Git-Tag: v4.4.215~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2d5c2ccfb7553e155df64d5ba88a92a1dcc6851;p=thirdparty%2Fkernel%2Fstable-queue.git

drop queue-5.5/drm-amd-display-fix-dtm-unloading.patch
---

diff --git a/queue-5.5/drm-amd-display-fix-dtm-unloading.patch b/queue-5.5/drm-amd-display-fix-dtm-unloading.patch
deleted file mode 100644
index 780ba1fb4ed..00000000000
--- a/queue-5.5/drm-amd-display-fix-dtm-unloading.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c6f8c440441029d5621ee5153676243234a4b76e Mon Sep 17 00:00:00 2001
-From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
-Date: Fri, 7 Feb 2020 10:41:20 -0500
-Subject: drm/amd/display: fix dtm unloading
-
-From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
-
-commit c6f8c440441029d5621ee5153676243234a4b76e upstream.
-
-there was a type in the terminate command.
-
-We should be calling psp_dtm_unload() instead of psp_hdcp_unload()
-
-Fixes: 143f23053333 ("drm/amdgpu: psp DTM init")
-Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
-Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c |   26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-@@ -1112,6 +1112,30 @@ static void psp_prep_dtm_ta_invoke_cmd_b
- 	/* Note: cmd_invoke_cmd.buf is not used for now */
- }
- 
-+static int psp_dtm_unload(struct psp_context *psp)
-+{
-+	int ret;
-+	struct psp_gfx_cmd_resp *cmd;
-+
-+	/*
-+	 * TODO: bypass the unloading in sriov for now
-+	 */
-+	if (amdgpu_sriov_vf(psp->adev))
-+		return 0;
-+
-+	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
-+	if (!cmd)
-+		return -ENOMEM;
-+
-+	psp_prep_ta_unload_cmd_buf(cmd, psp->dtm_context.session_id);
-+
-+	ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
-+
-+	kfree(cmd);
-+
-+	return ret;
-+}
-+
- int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
- {
- 	int ret;
-@@ -1150,7 +1174,7 @@ static int psp_dtm_terminate(struct psp_
- 	if (!psp->dtm_context.dtm_initialized)
- 		return 0;
- 
--	ret = psp_hdcp_unload(psp);
-+	ret = psp_dtm_unload(psp);
- 	if (ret)
- 		return ret;
-