Commit b09cb299 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Fix suspend failure with secure display TA 

commit c760bcda ("drm/amd: Check whether secure display TA loaded
successfully") attempted to fix extra messages, but failed to port the
cleanup that was in commit 5c6d52ff ("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: c760bcda ("drm/amd: Check whether secure display TA loaded successfully")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 4104c0a4)
parent eb6e7f52

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

+4 −1
Original line number Diff line number Diff line
@@ -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);