Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e5c21ca authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 6554d9a0

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {