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

Commit 20707874 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/radeon: do not move bo to different placement at each cs" 

This reverts commit d025e9e2.

This causes corruption for a number of users and needs further
investigation in the next cycle.
https://bugzilla.kernel.org/show_bug.cgi?id=52491
https://bugs.freedesktop.org/show_bug.cgi?id=58659
http://lists.freedesktop.org/archives/dri-devel/2013-January/032961.html



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5f0839c1

drivers/gpu/drm/radeon/radeon.h

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ struct radeon_bo { 
	struct list_head		list;

	/* Protected by tbo.reserved */

	u32				placements[3];

	u32				busy_placements[3];

	struct ttm_placement		placement;

	struct ttm_buffer_object	tbo;

	struct ttm_bo_kmap_obj		kmap;

drivers/gpu/drm/radeon/radeon_object.c

+10 −8
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) 
	rbo->placement.fpfn = 0;

	rbo->placement.lpfn = 0;

	rbo->placement.placement = rbo->placements;

	rbo->placement.busy_placement = rbo->placements;

	if (domain & RADEON_GEM_DOMAIN_VRAM)

		rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |

					TTM_PL_FLAG_VRAM;
@@ -104,14 +105,6 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) 
	if (!c)

		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

	rbo->placement.num_placement = c;



	c = 0;

	rbo->placement.busy_placement = rbo->busy_placements;

	if (rbo->rdev->flags & RADEON_IS_AGP) {

		rbo->busy_placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT;

	} else {

		rbo->busy_placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_TT;

	}

	rbo->placement.num_busy_placement = c;

}
@@ -357,6 +350,7 @@ int radeon_bo_list_validate(struct list_head *head) 
{

	struct radeon_bo_list *lobj;

	struct radeon_bo *bo;

	u32 domain;

	int r;



	r = ttm_eu_reserve_buffers(head);
@@ -366,9 +360,17 @@ int radeon_bo_list_validate(struct list_head *head) 
	list_for_each_entry(lobj, head, tv.head) {

		bo = lobj->bo;

		if (!bo->pin_count) {

			domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain;

			

		retry:

			radeon_ttm_placement_from_domain(bo, domain);

			r = ttm_bo_validate(&bo->tbo, &bo->placement,

						true, false);

			if (unlikely(r)) {

				if (r != -ERESTARTSYS && domain == RADEON_GEM_DOMAIN_VRAM) {

					domain |= RADEON_GEM_DOMAIN_GTT;

					goto retry;

				}

				return r;

			}

		}