drm/amdgpu: add num_level to the VM manager

Needs to be filled with handling.

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 69535d9c1ed117e832d5885dc37fcf8b38f7ba64..e56df942af8e0b14b2b2b2d5de5bbe46fc2001a5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -154,6 +154,7 @@ struct amdgpu_vm_manager {
        unsigned                                seqno[AMDGPU_MAX_RINGS];
 
        uint32_t                                max_pfn;
+       uint32_t                                num_level;
        /* vram base address for page table entry  */
        u64                                     vram_base_offset;
        /* is vm enabled? */

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 35f74c6d1f298a532fea05bf250cd0b0e8afa092..d9586601a437e8c68ce03308d2b692245331cf8c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -621,6 +621,7 @@ static int gmc_v6_0_vm_init(struct amdgpu_device *adev)
         * amdkfd will use VMIDs 8-15
         */
        adev->vm_manager.num_ids = AMDGPU_NUM_OF_VMIDS;
+       adev->vm_manager.num_level = 1;
        amdgpu_vm_manager_init(adev);
 
        /* base offset of vram pages */

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index dc9b6d62d1ab18cf3e4a0c478495824ba270faf0..0c0a6015cca55e87c28577748d6bc5619f21de3c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -742,6 +742,7 @@ static int gmc_v7_0_vm_init(struct amdgpu_device *adev)
         * amdkfd will use VMIDs 8-15
         */
        adev->vm_manager.num_ids = AMDGPU_NUM_OF_VMIDS;
+       adev->vm_manager.num_level = 1;
        amdgpu_vm_manager_init(adev);
 
        /* base offset of vram pages */

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index ead889aa6fa7e343f8a7d162f495acedf50abc3c..d19d1c5e28474c3ee62130c6f206b9eee49c9f37 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -945,6 +945,7 @@ static int gmc_v8_0_vm_init(struct amdgpu_device *adev)
         * amdkfd will use VMIDs 8-15
         */
        adev->vm_manager.num_ids = AMDGPU_NUM_OF_VMIDS;
+       adev->vm_manager.num_level = 1;
        amdgpu_vm_manager_init(adev);
 
        /* base offset of vram pages */

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 232c20808b550b0daa16de78973275840db0176b..5b4eb7ad24cd7ad5cd0b64bb28e25c891ed250e2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -500,6 +500,7 @@ static int gmc_v9_0_vm_init(struct amdgpu_device *adev)
         * amdkfd will use VMIDs 8-15
         */
        adev->vm_manager.num_ids = AMDGPU_NUM_OF_VMIDS;
+       adev->vm_manager.num_level = 1;
        amdgpu_vm_manager_init(adev);
 
        /* base offset of vram pages */