aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChunming Zhou <David1.Zhou@amd.com>2016-04-24 22:19:13 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-05-11 12:31:14 -0400
commit031e2983e8e385b9c99367586decabf6323ae049 (patch)
treeb5ab8ba21018069101e8773682e34e55aeb338c3 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent444066b915c1b9d0aa4ec7b2d2bbe627e08bf7a6 (diff)
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: Chunming Zhou <David1.Zhou@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Monk Liu <monk.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 113fd4bf9b64..e72cf4518c30 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -363,6 +363,7 @@ struct amdgpu_fence_driver {
363/* some special values for the owner field */ 363/* some special values for the owner field */
364#define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul) 364#define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul)
365#define AMDGPU_FENCE_OWNER_VM ((void*)1ul) 365#define AMDGPU_FENCE_OWNER_VM ((void*)1ul)
366#define AMDGPU_CLIENT_ID_RESERVED 2
366 367
367#define AMDGPU_FENCE_FLAG_64BIT (1 << 0) 368#define AMDGPU_FENCE_FLAG_64BIT (1 << 0)
368#define AMDGPU_FENCE_FLAG_INT (1 << 1) 369#define AMDGPU_FENCE_FLAG_INT (1 << 1)
@@ -885,6 +886,9 @@ struct amdgpu_vm {
885 886
886 /* Scheduler entity for page table updates */ 887 /* Scheduler entity for page table updates */
887 struct amd_sched_entity entity; 888 struct amd_sched_entity entity;
889
890 /* client id */
891 u64 client_id;
888}; 892};
889 893
890struct amdgpu_vm_id { 894struct amdgpu_vm_id {
@@ -924,6 +928,8 @@ struct amdgpu_vm_manager {
924 struct amdgpu_ring *vm_pte_rings[AMDGPU_MAX_RINGS]; 928 struct amdgpu_ring *vm_pte_rings[AMDGPU_MAX_RINGS];
925 unsigned vm_pte_num_rings; 929 unsigned vm_pte_num_rings;
926 atomic_t vm_pte_next_ring; 930 atomic_t vm_pte_next_ring;
931 /* client id counter */
932 atomic64_t client_counter;
927}; 933};
928 934
929void amdgpu_vm_manager_init(struct amdgpu_device *adev); 935void amdgpu_vm_manager_init(struct amdgpu_device *adev);