Commit 31a25e2c authored Sep 17, 2014 by Alex Deucher

drm/radeon: don't reset dma on NI/SI init

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

bug:
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=83500



Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

parent 39da0384

drivers/gpu/drm/radeon/ni_dma.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -191,12 +191,6 @@ int cayman_dma_resume(struct radeon_device *rdev)
		u32 reg_offset, wb_offset;
		int i, r;

		/* Reset dma */
		WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA \| SOFT_RESET_DMA1);
		RREG32(SRBM_SOFT_RESET);
		udelay(50);
		WREG32(SRBM_SOFT_RESET, 0);

		for (i = 0; i < 2; i++) {
		if (i == 0) {
		ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX];