]> Pileus Git - ~andy/linux/commitdiff
drm/radeon/cik: properly set sdma ring status on disable
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 12 Mar 2014 19:15:58 +0000 (15:15 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 12 Mar 2014 19:53:24 +0000 (15:53 -0400)
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
drivers/gpu/drm/radeon/cik_sdma.c

index 1ecb3f1070e35c6ed3516e5f325eeeb61bc795b2..5d7a5fa3741a72fb01148ac6c7a136b04ada65ad 100644 (file)
@@ -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;
 }
 
 /**