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

Commit 4a6adec5 authored by Jérôme Glisse's avatar Jérôme Glisse Committed by Sasha Levin
Browse files

drm/radeon: SDMA fix hibernation (CI GPU family). 



[ Upstream commit 2ba8d1bb8f6b589037f7db1f01144fc80750e8f7 ]

In order for hibernation to reliably work we need to properly turn
off the SDMA block, sadly after numerous attemps i haven't not found
proper sequence for clean and full shutdown. So simply reset both
SDMA block, this makes hibernation works reliably on sea island GPU
family (CI)

Hibernation and suspend to ram were tested (several times) on :
Bonaire
Hawaii
Mullins
Kaveri
Kabini

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent bce1845b

drivers/gpu/drm/radeon/cik_sdma.c

+11 −0
Original line number Diff line number Diff line
@@ -268,6 +268,17 @@ static void cik_sdma_gfx_stop(struct radeon_device *rdev) 
	}

	rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false;

	rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false;



	/* FIXME use something else than big hammer but after few days can not

	 * seem to find good combination so reset SDMA blocks as it seems we

	 * do not shut them down properly. This fix hibernation and does not

	 * affect suspend to ram.

	 */

	WREG32(SRBM_SOFT_RESET, SOFT_RESET_SDMA | SOFT_RESET_SDMA1);

	(void)RREG32(SRBM_SOFT_RESET);

	udelay(50);

	WREG32(SRBM_SOFT_RESET, 0);

	(void)RREG32(SRBM_SOFT_RESET);

}



/**