On Wed, Nov 5, 2025 at 10:56 AM Mario Limonciello <[email protected]> wrote: > > commit c760bcda83571 ("drm/amd: Check whether secure display TA loaded > successfully") attempted to fix extra messages, but failed to port the > cleanup that was in commit 5c6d52ff4b61e ("drm/amd: Don't try to enable > secure display TA multiple times") to prevent multiple tries. > > Add that to the failure handling path even on a quick failure. > > Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4679 > Fixes: c760bcda83571 ("drm/amd: Check whether secure display TA loaded > successfully") > Signed-off-by: Mario Limonciello <[email protected]>
Reviewed-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index 8c0e5d03de50..aa7987d0806c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -2355,8 +2355,11 @@ static int psp_securedisplay_initialize(struct > psp_context *psp) > if (!ret && !psp->securedisplay_context.context.resp_status) { > psp->securedisplay_context.context.initialized = true; > mutex_init(&psp->securedisplay_context.mutex); > - } else > + } else { > + /* don't try again */ > + psp->securedisplay_context.context.bin_desc.size_bytes = 0; > return ret; > + } > > mutex_lock(&psp->securedisplay_context.mutex); > > -- > 2.51.2 >
