On 03/27/2017 12:53 AM, Chunming Zhou wrote:
> From: Christian König <christian.koenig at amd.com>
>
> Needs to be filled with handling.
>
> Change-Id: I04881a2b304a020c259ce85e94b12900a77f1c02
> Signed-off-by: Christian König <christian.koenig at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 +
> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 +
> 5 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 6be6c71..e208186f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -151,6 +151,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 7155ae5..0ce0d0a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -607,6 +607,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;
It seems that consistency here would dictate the variable be named
"num_levels."
> 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 ff4cc63..f90dba5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -734,6 +734,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;
> adev->vm_manager.shared_aperture_start = 0x2000000000000000ULL;
> adev->vm_manager.shared_aperture_end =
> adev->vm_manager.shared_aperture_start + (4ULL << 30) - 1;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index d7d025a..fe79328 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -865,6 +865,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;
> adev->vm_manager.shared_aperture_start = 0x2000000000000000ULL;
> adev->vm_manager.shared_aperture_end =
> adev->vm_manager.shared_aperture_start + (4ULL << 30) - 1;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 58557add8..6625a2f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -508,6 +508,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);
>
> return 0;
