diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-12-03 06:03:49 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-12-04 00:26:51 +0100 |
| commit | 5e5c21cac1001089007260c48b0c89ebaace0e71 (patch) | |
| tree | b0de5ccf8341f4bb71b448a74d1ec9c83125da5b | |
| parent | drm/radeon: fix copy paste typos in fan control for si/ci (diff) | |
| download | linux-5e5c21cac1001089007260c48b0c89ebaace0e71.tar.xz linux-5e5c21cac1001089007260c48b0c89ebaace0e71.zip | |
drm/radeon: check the right ring in radeon_evict_flags()
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
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index cbe7b32d181c..d02aa1d0f588 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -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)) { |