Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10ea9434 authored by jimqu's avatar jimqu Committed by Alex Deucher
Browse files

drm/amd/amdgpu: sdma resume fail during S4 on CI 



SDMA could be fail in the thaw() and restore() processes, do software reset
if each SDMA engine is busy.

Signed-off-by: default avatarJimQu <Jim.Qu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 279cf3f2

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

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev); 
static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);

static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);

static int cik_sdma_soft_reset(void *handle);



MODULE_FIRMWARE("radeon/bonaire_sdma.bin");

MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
@@ -1037,6 +1038,8 @@ static int cik_sdma_resume(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	cik_sdma_soft_reset(handle);



	return cik_sdma_hw_init(adev);

}