diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-09-18 10:18:43 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-09-18 18:57:09 -0400 |
| commit | 799028d5d85384cce140323be633c8d5f079193f (patch) | |
| tree | 1ecae8563afa60a39d7be0115ac7779bf7c2a1a6 /drivers/gpu/drm/radeon/cik_sdma.c | |
| parent | 31a25e2caf9367365fcb0e57fd8fa5a42e9b73e4 (diff) | |
| download | talos-op-linux-799028d5d85384cce140323be633c8d5f079193f.tar.gz talos-op-linux-799028d5d85384cce140323be633c8d5f079193f.zip | |
drm/radeon: don't reset sdma on CIK init
Otherwise we may lose the DMA golden settings which can
lead to hangs, etc.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 192278bc993c..c4ffa54b1e3d 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -489,13 +489,6 @@ int cik_sdma_resume(struct radeon_device *rdev) { int r; - /* Reset dma */ - WREG32(SRBM_SOFT_RESET, SOFT_RESET_SDMA | SOFT_RESET_SDMA1); - RREG32(SRBM_SOFT_RESET); - udelay(50); - WREG32(SRBM_SOFT_RESET, 0); - RREG32(SRBM_SOFT_RESET); - r = cik_sdma_load_microcode(rdev); if (r) return r; |
