Commit 7d102d16 authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman

drm/radeon: don't reset sdma on CIK init

commit 799028d5 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63dcd5a8
...@@ -459,13 +459,6 @@ int cik_sdma_resume(struct radeon_device *rdev) ...@@ -459,13 +459,6 @@ int cik_sdma_resume(struct radeon_device *rdev)
{ {
int r; 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); r = cik_sdma_load_microcode(rdev);
if (r) if (r)
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment