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

Commit c1789a2e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: don't reset dma on r6xx-evergreen init 



Otherwise we may lose the DMA golden settings which can
lead to hangs, etc.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 799028d5

drivers/gpu/drm/radeon/r600_dma.c

+0 −9
Original line number Diff line number Diff line
@@ -124,15 +124,6 @@ int r600_dma_resume(struct radeon_device *rdev) 
	u32 rb_bufsz;

	int r;



	/* Reset dma */

	if (rdev->family >= CHIP_RV770)

		WREG32(SRBM_SOFT_RESET, RV770_SOFT_RESET_DMA);

	else

		WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA);

	RREG32(SRBM_SOFT_RESET);

	udelay(50);

	WREG32(SRBM_SOFT_RESET, 0);



	WREG32(DMA_SEM_INCOMPLETE_TIMER_CNTL, 0);

	WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL, 0);