drm/radeon: check the right ring in radeon_evict_flags()
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 3 Dec 2014 05:03:49 +0000 (00:03 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 3 Dec 2014 23:26:51 +0000 (18:26 -0500)
Check the that ring we are using for copies is functional
rather than the GFX ring.  On newer asics we use the DMA
ring for bo moves.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_ttm.c

index cbe7b32d181c2f3bf2972b14f12c72597d3e15f5..d02aa1d0f5885408c877056bd4ac1ab0e1ed6f12 100644 (file)
@@ -196,7 +196,7 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
        rbo = container_of(bo, struct radeon_bo, tbo);
        switch (bo->mem.mem_type) {
        case TTM_PL_VRAM:
-               if (rbo->rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready == false)
+               if (rbo->rdev->ring[radeon_copy_ring_index(rbo->rdev)].ready == false)
                        radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU);
                else if (rbo->rdev->mc.visible_vram_size < rbo->rdev->mc.real_vram_size &&
                         bo->mem.start < (rbo->rdev->mc.visible_vram_size >> PAGE_SHIFT)) {