Skip to content

Commit b09cb29

Browse files
superm1alexdeucher
authored andcommitted
drm/amd: Fix suspend failure with secure display TA
commit c760bcd ("drm/amd: Check whether secure display TA loaded successfully") attempted to fix extra messages, but failed to port the cleanup that was in commit 5c6d52f ("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: c760bcd ("drm/amd: Check whether secure display TA loaded successfully") Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 4104c0a)
1 parent eb6e7f5 commit b09cb29

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2355,8 +2355,11 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
23552355
if (!ret && !psp->securedisplay_context.context.resp_status) {
23562356
psp->securedisplay_context.context.initialized = true;
23572357
mutex_init(&psp->securedisplay_context.mutex);
2358-
} else
2358+
} else {
2359+
/* don't try again */
2360+
psp->securedisplay_context.context.bin_desc.size_bytes = 0;
23592361
return ret;
2362+
}
23602363

23612364
mutex_lock(&psp->securedisplay_context.mutex);
23622365

0 commit comments

Comments
 (0)