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

Commit e1a575ad authored Mar 28, 2016 by Michel Dänzer Committed by Alex Deucher Mar 28, 2016

drm/radeon: Don't move pinned BOs



The purpose of pinning is to prevent a buffer from moving.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 0e5585dc

drivers/gpu/drm/radeon/radeon_object.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -799,6 +799,10 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
		if ((offset + size) <= rdev->mc.visible_vram_size)
		return 0;

		/* Can't move a pinned BO to visible VRAM */
		if (rbo->pin_count > 0)
		return -EINVAL;

		/* hurrah the memory is not visible ! */
		radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);
		lpfn = rdev->mc.visible_vram_size >> PAGE_SHIFT;

drivers/gpu/drm/radeon/radeon_ttm.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -397,9 +397,15 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
		struct ttm_mem_reg *new_mem)
		{
		struct radeon_device *rdev;
		struct radeon_bo *rbo;
		struct ttm_mem_reg *old_mem = &bo->mem;
		int r;

		/* Can't move a pinned BO */
		rbo = container_of(bo, struct radeon_bo, tbo);
		if (WARN_ON_ONCE(rbo->pin_count > 0))
		return -EINVAL;

		rdev = radeon_get_rdev(bo->bdev);
		if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
		radeon_move_null(bo, new_mem);