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

Commit 031e2983 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: add client id for every vm 



This adds a unique id for each vm client so we can
properly track them.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 444066b9

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

+6 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct amdgpu_fence_driver { 
/* some special values for the owner field */

#define AMDGPU_FENCE_OWNER_UNDEFINED	((void*)0ul)

#define AMDGPU_FENCE_OWNER_VM		((void*)1ul)

#define AMDGPU_CLIENT_ID_RESERVED       2



#define AMDGPU_FENCE_FLAG_64BIT         (1 << 0)

#define AMDGPU_FENCE_FLAG_INT           (1 << 1)
@@ -885,6 +886,9 @@ struct amdgpu_vm { 


	/* Scheduler entity for page table updates */

	struct amd_sched_entity	entity;



	/* client id */

	u64                     client_id;

};



struct amdgpu_vm_id {
@@ -924,6 +928,8 @@ struct amdgpu_vm_manager { 
	struct amdgpu_ring                      *vm_pte_rings[AMDGPU_MAX_RINGS];

	unsigned				vm_pte_num_rings;

	atomic_t				vm_pte_next_ring;

	/* client id counter */

	atomic64_t				client_counter;

};



void amdgpu_vm_manager_init(struct amdgpu_device *adev);

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

+2 −0
Original line number Diff line number Diff line
@@ -1386,6 +1386,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
	for (i = 0; i < AMDGPU_MAX_RINGS; ++i)

		vm->ids[i] = NULL;

	vm->va = RB_ROOT;

	vm->client_id = atomic64_inc_return(&adev->vm_manager.client_counter);

	spin_lock_init(&vm->status_lock);

	INIT_LIST_HEAD(&vm->invalidated);

	INIT_LIST_HEAD(&vm->cleared);
@@ -1514,6 +1515,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev) 
	}



	atomic_set(&adev->vm_manager.vm_pte_next_ring, 0);

	atomic64_set(&adev->vm_manager.client_counter, AMDGPU_CLIENT_ID_RESERVED);

}



/**