From: Alex Deucher Date: Wed, 12 Mar 2014 19:15:58 +0000 (-0400) Subject: drm/radeon/cik: properly set sdma ring status on disable X-Git-Tag: v3.12.15~32 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=703ee1e3778f1d287b5e4d902285ab64a124f519;p=thirdparty%2Fkernel%2Fstable.git drm/radeon/cik: properly set sdma ring status on disable commit 7b1bbe883b3ed962ca2be4daf321f318f5091340 upstream. 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 Signed-off-by: Jiri Slaby --- diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index aaf7ffce8b5bc..c0c9b1b8af053 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -174,6 +174,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; } /**