FAILED: patch "[PATCH] drm/amd/display: fix dtm unloading" failed to apply to 5.5-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c6f8c440441029d5621ee5153676243234a4b76e Mon Sep 17 00:00:00 2001
From: Bhawanpreet Lakha <[email protected]>
Date: Fri, 7 Feb 2020 10:41:20 -0500
Subject: [PATCH] drm/amd/display: fix dtm unloading
there was a type in the terminate command.
We should be calling psp_dtm_unload() instead of psp_hdcp_unload()
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +25 -1
@@ -1013,6 +1013,30 @@ static int psp_dtm_initialize(struct psp_context *psp)return 0 ; } +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) {/*
@@ -1037,7 +1061,7 @@ static int psp_dtm_terminate(struct psp_context *psp)if (!psp->dtm_context.dtm_initialized)return 0 ; - ret =psp_hdcp_unload (psp); + ret =psp_dtm_unload (psp);if (ret)return ret;
Greg KH
maintainerQuoted 5 lines · On Thu, Feb 27, 2020 at 01:19:29PM +0100, [email protected] wrote:
The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Note, it applied, but broke the build :(
Deucher, Alexander
maintainer[AMD Official Use Only - Internal Distribution Only]
Quoted 13 lines
-----Original Message-----
From: Greg KH <[email protected]>
Sent: Thursday, February 27, 2020 7:22 AM
To: Lakha, Bhawanpreet <[email protected]>; Xu, Feifei <[email protected]>; Deucher, Alexander <[email protected]>
Cc: [email protected]
Subject: Re: FAILED: patch "[PATCH] drm/amd/display: fix dtm unloading" failed to apply to 5.5-stable treeQuoted 1 line · On Thu, Feb 27, 2020 at 01:19:29PM +0100, [email protected] wrote:
Quoted 6 lines
Quoted 4 lines
The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.Note, it applied, but broke the build :(
Please drop it. I'll take a look at alternatives.
Thanks!
Alex