drm/amd: Fix suspend failure with secure display TA
authorMario Limonciello <mario.limonciello@amd.com>
Tue, 4 Nov 2025 19:38:02 +0000 (13:38 -0600)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 6 Nov 2025 16:58:10 +0000 (11:58 -0500)
commitb09cb2996cdf50cd1ab4020e002c95d742c81313
treeed6890086ee669739cad4b56942abc9d0dc6fe9c
parenteb6e7f520d6efa4d4ebf1671455abe4a681f7a05
drm/amd: Fix suspend failure with secure display TA

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: c760bcda8357 ("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 4104c0a454f6a4d1e0d14895d03c0e7bdd0c8240)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c