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

Commit 44c4bd21 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: fence PT updates as shared 



The BO_VA contains everything necessary.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1d0c0942

drivers/gpu/drm/radeon/radeon_vm.c

+19 −9
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static void radeon_vm_frag_ptes(struct radeon_device *rdev, 
 *

 * Global and local mutex must be locked!

 */

static void radeon_vm_update_ptes(struct radeon_device *rdev,

static int radeon_vm_update_ptes(struct radeon_device *rdev,

				 struct radeon_vm *vm,

				 struct radeon_ib *ib,

				 uint64_t start, uint64_t end,
@@ -815,8 +815,12 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev, 
		struct radeon_bo *pt = vm->page_tables[pt_idx].bo;

		unsigned nptes;

		uint64_t pte;

		int r;



		radeon_sync_resv(rdev, &ib->sync, pt->tbo.resv, true);

		r = reservation_object_reserve_shared(pt->tbo.resv);

		if (r)

			return r;



		if ((addr & ~mask) == (end & ~mask))

			nptes = end - addr;
@@ -850,6 +854,8 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev, 
				    last_pte + 8 * count,

				    last_dst, flags);

	}



	return 0;

}



/**
@@ -874,7 +880,7 @@ static void radeon_vm_fence_pts(struct radeon_vm *vm, 
	end >>= radeon_vm_block_size;



	for (i = start; i <= end; ++i)

		radeon_bo_fence(vm->page_tables[i].bo, fence, false);

		radeon_bo_fence(vm->page_tables[i].bo, fence, true);

}



/**
@@ -983,9 +989,13 @@ int radeon_vm_bo_update(struct radeon_device *rdev, 
			radeon_sync_fence(&ib.sync, vm->ids[i].last_id_use);

	}



	radeon_vm_update_ptes(rdev, vm, &ib, bo_va->it.start,

	r = radeon_vm_update_ptes(rdev, vm, &ib, bo_va->it.start,

				  bo_va->it.last + 1, addr,

				  radeon_vm_page_flags(bo_va->flags));

	if (r) {

		radeon_ib_free(rdev, &ib);

		return r;

	}



	radeon_asic_vm_pad_ib(rdev, &ib);

	WARN_ON(ib.length_dw > ndw);