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

Commit 16ae42fe authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: use common fence for amdgpu_vm_fence 



Just cleanup the function parameters.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b56c2285

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, 
		     struct fence *updates);

void amdgpu_vm_fence(struct amdgpu_device *adev,

		     struct amdgpu_vm *vm,

		     struct amdgpu_fence *fence);

		     struct fence *fence);

uint64_t amdgpu_vm_map_gart(struct amdgpu_device *adev, uint64_t addr);

int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,

				    struct amdgpu_vm *vm);

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, 
	}



	if (ib->vm)

		amdgpu_vm_fence(adev, ib->vm, ib->fence);

		amdgpu_vm_fence(adev, ib->vm, &ib->fence->base);



	amdgpu_ring_unlock_commit(ring);

	return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+6 −6
Original line number Diff line number Diff line
@@ -241,16 +241,16 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, 
 */

void amdgpu_vm_fence(struct amdgpu_device *adev,

		     struct amdgpu_vm *vm,

		     struct amdgpu_fence *fence)

		     struct fence *fence)

{

	unsigned ridx = fence->ring->idx;

	unsigned vm_id = vm->ids[ridx].id;

	struct amdgpu_ring *ring = amdgpu_ring_from_fence(fence);

	unsigned vm_id = vm->ids[ring->idx].id;



	fence_put(adev->vm_manager.active[vm_id]);

	adev->vm_manager.active[vm_id] = fence_get(&fence->base);

	adev->vm_manager.active[vm_id] = fence_get(fence);



	fence_put(vm->ids[ridx].last_id_use);

	vm->ids[ridx].last_id_use = fence_get(&fence->base);

	fence_put(vm->ids[ring->idx].last_id_use);

	vm->ids[ring->idx].last_id_use = fence_get(fence);

}



/**