diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-12-03 00:03:49 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-26 14:39:24 +0100 |
| commit | c02ca53c957e1731bdd9afa75cdbf2a84c5d8519 (patch) | |
| tree | ea5138d285917822edc22f3cac2bec285e3b1cfb /drivers/gpu | |
| parent | 5d531ee5e76b84da1c114dddd9077d1e3a2d1ff7 (diff) | |
| download | lwn-c02ca53c957e1731bdd9afa75cdbf2a84c5d8519.tar.gz lwn-c02ca53c957e1731bdd9afa75cdbf2a84c5d8519.zip | |
drm/radeon: check the right ring in radeon_evict_flags()
commit 5e5c21cac1001089007260c48b0c89ebaace0e71 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/gpu')
| -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 84323c943bfc..02d3c3820803 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -189,7 +189,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 radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT); |