From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 17 Sep 2014 21:41:04 +0000 (-0400)
Subject: drm/radeon: don't reset dma on NI/SI init
X-Git-Tag: v3.14.20~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f145ecfb3ad63c6ddd265347d4684217c0618ad2;p=profile%2Fcommon%2Fkernel-common.git

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

commit 31a25e2caf9367365fcb0e57fd8fa5a42e9b73e4 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c
index 7cf96b1..94fa49e 100644
--- a/drivers/gpu/drm/radeon/ni_dma.c
+++ b/drivers/gpu/drm/radeon/ni_dma.c
@@ -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];