diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-03-12 15:15:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-03-12 15:53:24 -0400 |
| commit | 7b1bbe883b3ed962ca2be4daf321f318f5091340 (patch) | |
| tree | 74a3a9ef3df94cf6e6bdf11cc9cda21ebce3b4e8 | |
| parent | 7848865914c6a63ead674f0f5604b77df7d3874f (diff) | |
| download | linux-7b1bbe883b3ed962ca2be4daf321f318f5091340.tar.bz2 | |
drm/radeon/cik: properly set sdma ring status on disable
When we disable the rings, set the status properly. If
not other code pathes may try and use the rings which are
not functional at this point.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 1ecb3f1070e3..5d7a5fa3741a 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -264,6 +264,8 @@ static void cik_sdma_gfx_stop(struct radeon_device *rdev) WREG32(SDMA0_GFX_RB_CNTL + reg_offset, rb_cntl); WREG32(SDMA0_GFX_IB_CNTL + reg_offset, 0); } + rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false; + rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false; } /** |