diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-09-18 10:18:43 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:52:13 -0700 |
| commit | 92b17de46c089b63c420aac8baafa28b58cdf968 (patch) | |
| tree | 107b6b70186957d5dd33163a22ee682ad5dc6d78 /drivers/gpu | |
| parent | f145ecfb3ad63c6ddd265347d4684217c0618ad2 (diff) | |
| download | lwn-92b17de46c089b63c420aac8baafa28b58cdf968.tar.gz lwn-92b17de46c089b63c420aac8baafa28b58cdf968.zip | |
drm/radeon: don't reset sdma on CIK init
commit 799028d5d85384cce140323be633c8d5f079193f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
| -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 aac8f487e6df..66ba713ba7d7 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -461,13 +461,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; |