drm/amdgpu: merge VM manager and VM context ID structure

No need to have two of them any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index b9a6fe9a2a31..c1b10046317e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -839,13 +839,6 @@ struct amdgpu_vm_pt {
         uint64_t                        addr;
 };
 
-struct amdgpu_vm_id {
-        struct amdgpu_vm_manager_id     *mgr_id;
-        uint64_t                        pd_gpu_addr;
-        /* last flushed PD/PT update */
-        struct fence                    *flushed_updates;
-};
-
 struct amdgpu_vm {
         /* tree of virtual addresses mapped */
         struct rb_root          va;
@@ -871,7 +864,7 @@ struct amdgpu_vm {
         struct amdgpu_vm_pt     *page_tables;
 
         /* for id and flush management per ring */
-        struct amdgpu_vm_id     ids[AMDGPU_MAX_RINGS];
+        struct amdgpu_vm_id     *ids[AMDGPU_MAX_RINGS];
 
         /* protecting freed */
         spinlock_t              freed_lock;
@@ -880,11 +873,15 @@ struct amdgpu_vm {
         struct amd_sched_entity entity;
 };
 
-struct amdgpu_vm_manager_id {
+struct amdgpu_vm_id {
         struct list_head        list;
         struct fence            *active;
         atomic_long_t           owner;
 
+        uint64_t                pd_gpu_addr;
+        /* last flushed PD/PT update */
+        struct fence            *flushed_updates;
+
         uint32_t                gds_base;
         uint32_t                gds_size;
         uint32_t                gws_base;
@@ -898,7 +895,7 @@ struct amdgpu_vm_manager {
         struct mutex                            lock;
         unsigned                                num_ids;
         struct list_head                        ids_lru;
-        struct amdgpu_vm_manager_id             ids[AMDGPU_NUM_VM];
+        struct amdgpu_vm_id                     ids[AMDGPU_NUM_VM];
 
         uint32_t                                max_pfn;
         /* vram base address for page table entry  */