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

Commit c1814f33 authored by Evan Quan's avatar Evan Quan Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: perform srbm soft reset always on SDMA resume 



[ Upstream commit 253475c455eb5f8da34faa1af92709e7bb414624 ]

This can address the random SDMA hang after pci config reset
seen on Hawaii.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Tested-by: default avatarSandeep Raghuraman <sandy.8925@gmail.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6563e00f

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

+12 −15
Original line number Diff line number Diff line
@@ -1086,22 +1086,19 @@ static int cik_sdma_soft_reset(void *handle) 
{

	u32 srbm_soft_reset = 0;

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

	u32 tmp = RREG32(mmSRBM_STATUS2);

	u32 tmp;



	if (tmp & SRBM_STATUS2__SDMA_BUSY_MASK) {

	/* sdma0 */

	tmp = RREG32(mmSDMA0_F32_CNTL + SDMA0_REGISTER_OFFSET);

	tmp |= SDMA0_F32_CNTL__HALT_MASK;

	WREG32(mmSDMA0_F32_CNTL + SDMA0_REGISTER_OFFSET, tmp);

	srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_SDMA_MASK;

	}

	if (tmp & SRBM_STATUS2__SDMA1_BUSY_MASK) {



	/* sdma1 */

	tmp = RREG32(mmSDMA0_F32_CNTL + SDMA1_REGISTER_OFFSET);

	tmp |= SDMA0_F32_CNTL__HALT_MASK;

	WREG32(mmSDMA0_F32_CNTL + SDMA1_REGISTER_OFFSET, tmp);

	srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_SDMA1_MASK;

	}



	if (srbm_soft_reset) {

		tmp = RREG32(mmSRBM_SOFT_RESET);