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

Commit fa688343 authored by Christian König's avatar Christian König
Browse files

drm/radeon: further cleanup vm flushing & fencing 



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

drivers/gpu/drm/radeon/radeon.h

+3 −0
Original line number Diff line number Diff line
@@ -2804,6 +2804,9 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm); 
void radeon_vm_add_to_lru(struct radeon_device *rdev, struct radeon_vm *vm);

struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,

				       struct radeon_vm *vm, int ring);

void radeon_vm_flush(struct radeon_device *rdev,

                     struct radeon_vm *vm,

                     int ring);

void radeon_vm_fence(struct radeon_device *rdev,

		     struct radeon_vm *vm,

		     struct radeon_fence *fence);

drivers/gpu/drm/radeon/radeon_cs.c

+0 −4
Original line number Diff line number Diff line
@@ -511,10 +511,6 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev, 
		r = radeon_ib_schedule(rdev, &parser->ib, NULL);

	}



	if (!r) {

		radeon_vm_fence(rdev, vm, parser->ib.fence);

	}



out:

	radeon_vm_add_to_lru(rdev, vm);

	mutex_unlock(&vm->mutex);

drivers/gpu/drm/radeon/radeon_ring.c

+7 −9
Original line number Diff line number Diff line
@@ -153,11 +153,9 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, 
		return r;

	}



	/* if we can't remember our last VM flush then flush now! */

	/* XXX figure out why we have to flush for every IB */

	if (ib->vm /*&& !ib->vm->last_flush*/) {

		radeon_ring_vm_flush(rdev, ib->ring, ib->vm);

	}

	if (ib->vm)

		radeon_vm_flush(rdev, ib->vm, ib->ring);



	if (const_ib) {

		radeon_ring_ib_execute(rdev, const_ib->ring, const_ib);

		radeon_semaphore_free(rdev, &const_ib->semaphore, NULL);
@@ -172,10 +170,10 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, 
	if (const_ib) {

		const_ib->fence = radeon_fence_ref(ib->fence);

	}

	/* we just flushed the VM, remember that */

	if (ib->vm && !ib->vm->last_flush) {

		ib->vm->last_flush = radeon_fence_ref(ib->fence);

	}



	if (ib->vm)

		radeon_vm_fence(rdev, ib->vm, ib->fence);



	radeon_ring_unlock_commit(rdev, ring);

	return 0;

}

drivers/gpu/drm/radeon/radeon_vm.c

+28 −3
Original line number Diff line number Diff line
@@ -378,6 +378,27 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev, 
	return NULL;

}



/**

 * radeon_vm_flush - hardware flush the vm

 *

 * @rdev: radeon_device pointer

 * @vm: vm we want to flush

 * @ring: ring to use for flush

 *

 * Flush the vm (cayman+).

 *

 * Global and local mutex must be locked!

 */

void radeon_vm_flush(struct radeon_device *rdev,

		     struct radeon_vm *vm,

		     int ring)

{

	/* if we can't remember our last VM flush then flush now! */

	/* XXX figure out why we have to flush all the time */

	if (!vm->last_flush || true)

		radeon_ring_vm_flush(rdev, ring, vm);

}



/**

 * radeon_vm_fence - remember fence for vm

 *
@@ -394,14 +415,18 @@ void radeon_vm_fence(struct radeon_device *rdev, 
		     struct radeon_vm *vm,

		     struct radeon_fence *fence)

{

	radeon_fence_unref(&rdev->vm_manager.active[vm->id]);

	rdev->vm_manager.active[vm->id] = radeon_fence_ref(fence);



	radeon_fence_unref(&vm->fence);

	vm->fence = radeon_fence_ref(fence);



	radeon_fence_unref(&rdev->vm_manager.active[vm->id]);

	rdev->vm_manager.active[vm->id] = radeon_fence_ref(fence);



	radeon_fence_unref(&vm->last_id_use);

	vm->last_id_use = radeon_fence_ref(fence);



        /* we just flushed the VM, remember that */

        if (!vm->last_flush)

                vm->last_flush = radeon_fence_ref(fence);

}



/**