drm/amdgpu: set vm size and block size by individual gmc by default (v2)
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: set vm size and block size by individual gmc by default (v2)
By default, the value is set by individual gmc.
if a specific value is input, it overrides the global value for all
v2: create helper funcs
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 31 ++++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 38 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 ++++--- 8 files changed, 60 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13 -18
@@ -1039,35 +1039,31 @@ static bool amdgpu_check_pot_argument(int arg)return (arg & (arg -1 )) ==0 ; } -static void amdgpu_get_block_size (struct amdgpu_device *adev) +static void amdgpu_check_block_size (struct amdgpu_device *adev) {/* defines number of bits in page table versus page directory, * a page is 4KB so we have 12 bits offset, minimum 9 bits in the * page table and the remaining bits are in the page directory */ -if (amdgpu_vm_block_size ==-1 ) { - -/* Total bits covered by PD + PTs */ -unsigned bits =ilog2 (amdgpu_vm_size) +18 ; - -/* Make sure the PD is 4K in size up to 8GB address space. -Above that split equal between PD and PTs */ -if (amdgpu_vm_size <=8 ) - amdgpu_vm_block_size = bits -9 ; -else - amdgpu_vm_block_size = (bits +3 ) /2 ; +if (amdgpu_vm_block_size ==-1 ) +return ; - }else if (amdgpu_vm_block_size <9 ) { +if (amdgpu_vm_block_size <9 ) {dev_warn (adev->dev,"VM page table size (%d) too small\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; }if (amdgpu_vm_block_size >24 || (amdgpu_vm_size *1024 ) < (1ull << amdgpu_vm_block_size)) {dev_warn (adev->dev,"VM page table size (%d) too large\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; } + +return ; + +def_value: + amdgpu_vm_block_size =-1 ; }static void amdgpu_check_vm_size (struct amdgpu_device *adev)
@@ -1096,8 +1092,7 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev)return ; def_value: - amdgpu_vm_size =8 ; -dev_info (adev->dev,"set default VM size %dGB\n" , amdgpu_vm_size); + amdgpu_vm_size =-1 ; }/**
@@ -1131,7 +1126,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev)amdgpu_check_vm_size (adev); -amdgpu_get_block_size (adev); +amdgpu_check_block_size (adev);if (amdgpu_vram_page_split !=-1 && (amdgpu_vram_page_split <16 || !amdgpu_check_pot_argument (amdgpu_vram_page_split))) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -86,7 +86,7 @@unsigned amdgpu_ip_block_mask =0xffffffff ;int amdgpu_bapm =-1 ;int amdgpu_deep_color =0 ; -int amdgpu_vm_size =64 ; +int amdgpu_vm_size =-1 ;int amdgpu_vm_block_size =-1 ;int amdgpu_vm_fault_stop =0 ;int amdgpu_vm_debug =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +38 -0
@@ -2064,6 +2064,44 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, } } +static uint32_t amdgpu_get_block_size (uint64_t vm_size) +{ +/* Total bits covered by PD + PTs */ +unsigned bits =ilog2 (vm_size) +18 ; + +/* Make sure the PD is 4K in size up to 8GB address space. +Above that split equal between PD and PTs */ +if (vm_size <=8 ) +return (bits -9 ); +else +return ((bits +3 ) /2 ); +} + +/** +* amdgpu_vm_adjust_size - adjust vm size and block size +* +* @adev: amdgpu_device pointer +* @vm_size: the default vm size if it's set auto +*/ +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size) +{ +/* adjust vm size firstly */ +if (amdgpu_vm_size ==-1 ) + adev->vm_manager.vm_size = vm_size; +else + adev->vm_manager.vm_size = amdgpu_vm_size; + +/* block size depends on vm size */ +if (amdgpu_vm_block_size ==-1 ) + adev->vm_manager.block_size = +amdgpu_get_block_size (adev->vm_manager.vm_size); +else + adev->vm_manager.block_size = amdgpu_vm_block_size; + +DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , + adev->vm_manager.vm_size, adev->vm_manager.block_size); +} +/** * amdgpu_vm_init - initialize a vm instance *
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -0
@@ -234,5 +234,6 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size);#endif
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -5
@@ -849,13 +849,9 @@ static int gmc_v6_0_sw_init(void *handle)if (r)return r; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); - adev->mc.mc_mask =0xffffffffffULL ; adev->need_dma32 = false;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -5
@@ -1003,13 +1003,9 @@ static int gmc_v7_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space.
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -5
@@ -1087,13 +1087,9 @@ static int gmc_v8_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space.
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -5
@@ -552,8 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)if (adev->flags &AMD_IS_APU ) { adev->mc.vram_type =AMDGPU_VRAM_TYPE_UNKNOWN ; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); }else {/* XXX Don't know how to get VRAM type yet. */ adev->mc.vram_type =AMDGPU_VRAM_TYPE_HBM ;
@@ -564,11 +563,11 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; +DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , + adev->vm_manager.vm_size, + adev->vm_manager.block_size); } -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* This interrupt is VMC page fault.*/ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_VMC ,0 , &adev->mc.vm_fault);
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1491473999-20529-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Am 06.04.2017 um 12:19 schrieb Junwei Zhang:
Quoted 6 lines
By default, the value is set by individual gmc.
if a specific value is input, it overrides the global value for allv2: create helper funcs
Signed-off-by Junwei Zhang <[email protected]>
A few minor issues below, but apart from that looks good to me.
Quoted 99 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 31 ++++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 38 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 ++++--- 8 files changed, 60 insertions(+), 39 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13
-18@@ -1039,35 +1039,31 @@ static bool amdgpu_check_pot_argument(int arg)return (arg & (arg -1 )) ==0 ; } -static void amdgpu_get_block_size (struct amdgpu_device *adev) +static void amdgpu_check_block_size (struct amdgpu_device *adev) {/* defines number of bits in page table versus page directory, * a page is 4KB so we have 12 bits offset, minimum 9 bits in the * page table and the remaining bits are in the page directory */ -if (amdgpu_vm_block_size ==-1 ) { - -/* Total bits covered by PD + PTs */ -unsigned bits =ilog2 (amdgpu_vm_size) +18 ; - -/* Make sure the PD is 4K in size up to 8GB address space. -Above that split equal between PD and PTs */ -if (amdgpu_vm_size <=8 ) - amdgpu_vm_block_size = bits -9 ; -else - amdgpu_vm_block_size = (bits +3 ) /2 ; +if (amdgpu_vm_block_size ==-1 ) +return ; - }else if (amdgpu_vm_block_size <9 ) { +if (amdgpu_vm_block_size <9 ) {dev_warn (adev->dev,"VM page table size (%d) too small\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; }if (amdgpu_vm_block_size >24 || (amdgpu_vm_size *1024 ) < (1ull << amdgpu_vm_block_size)) {dev_warn (adev->dev,"VM page table size (%d) too large\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; } + +return ; + +def_value: + amdgpu_vm_block_size =-1 ; }static void amdgpu_check_vm_size (struct amdgpu_device *adev)@@ -1096,8 +1092,7 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev)return ; def_value: - amdgpu_vm_size =8 ; -dev_info (adev->dev,"set default VM size %dGB\n" , amdgpu_vm_size); + amdgpu_vm_size =-1 ; }/** @@ -1131,7 +1126,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev)amdgpu_check_vm_size (adev); -amdgpu_get_block_size (adev); +amdgpu_check_block_size (adev);if (amdgpu_vram_page_split !=-1 && (amdgpu_vram_page_split <16 || !amdgpu_check_pot_argument (amdgpu_vram_page_split))) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-1@@ -86,7 +86,7 @@unsigned amdgpu_ip_block_mask =0xffffffff ;int amdgpu_bapm =-1 ;int amdgpu_deep_color =0 ; -int amdgpu_vm_size =64 ; +int amdgpu_vm_size =-1 ;int amdgpu_vm_block_size =-1 ;int amdgpu_vm_fault_stop =0 ;int amdgpu_vm_debug =0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, · line 2067
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0@@ -2064,6 +2064,44 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, } } +static uint32_t amdgpu_get_block_size (uint64_t vm_size)
Please rename that to amdgpu_vm_get_block_size().
Quoted 113 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +37
-0+{ +/* Total bits covered by PD + PTs */ +unsigned bits =ilog2 (vm_size) +18 ; + +/* Make sure the PD is 4K in size up to 8GB address space. +Above that split equal between PD and PTs */ +if (vm_size <=8 ) +return (bits -9 ); +else +return ((bits +3 ) /2 ); +} + +/** +* amdgpu_vm_adjust_size - adjust vm size and block size +* +* @adev: amdgpu_device pointer +* @vm_size: the default vm size if it's set auto +*/ +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size) +{ +/* adjust vm size firstly */ +if (amdgpu_vm_size ==-1 ) + adev->vm_manager.vm_size = vm_size; +else + adev->vm_manager.vm_size = amdgpu_vm_size; + +/* block size depends on vm size */ +if (amdgpu_vm_block_size ==-1 ) + adev->vm_manager.block_size = +amdgpu_get_block_size (adev->vm_manager.vm_size); +else + adev->vm_manager.block_size = amdgpu_vm_block_size; + +DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , + adev->vm_manager.vm_size, adev->vm_manager.block_size); +} +/** * amdgpu_vm_init - initialize a vm instance * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-0@@ -234,5 +234,6 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size);#endif drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1
-5@@ -849,13 +849,9 @@ static int gmc_v6_0_sw_init(void *handle)if (r)return r; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); - adev->mc.mc_mask =0xffffffffffULL ; adev->need_dma32 = false;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-5@@ -1003,13 +1003,9 @@ static int gmc_v7_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space. drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-5@@ -1087,13 +1087,9 @@ static int gmc_v8_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space. drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static int gmc_v9_0_sw_init(void *handle) · line 555
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-2@@ -552,8 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)if (adev->flags &AMD_IS_APU ) { adev->mc.vram_type =AMDGPU_VRAM_TYPE_UNKNOWN ; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 );
Make sure we also use 1 level page tables in the APU case as well.
With that done and the function renamed the patch is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-0}else {/* XXX Don't know how to get VRAM type yet. */ adev->mc.vram_type =AMDGPU_VRAM_TYPE_HBM ;@@ -564,11 +563,11 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; + DRM_INFO("vm size is %llu GB, block size is %u-bit\n",
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static int gmc_v9_0_sw_init(void *handle) · line 573
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2
-3+ adev->vm_manager.vm_size, + adev->vm_manager.block_size); } -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* This interrupt is VMC page fault.*/ r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_VMC ,0 , &adev->mc.vm_fault);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 04eb5d6d-8d29-82aa-e367-d918e71253d2-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
在 2017年4月6日,20:07,Christian König <[email protected]<mailto:[email protected]>> 写道:
Am 06.04.2017 um 12:19 schrieb Junwei Zhang:
By default, the value is set by individual gmc.
if a specific value is input, it overrides the global value for all
v2: create helper funcs
A few minor issues below, but apart from that looks good to me.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 31 ++++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 38 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 ++++--- 8 files changed, 60 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13 -15
@@ -1039,35 +1039,31 @@ static bool amdgpu_check_pot_argument(int arg)return (arg & (arg -1 )) ==0 ; } -static void amdgpu_get_block_size(struct amdgpu_device *adev) +static void amdgpu_check_block_size(struct amdgpu_device *adev) {/* defines number of bits in page table versus page directory, * a page is 4KB so we have 12 bits offset, minimum 9 bits in the * page table and the remaining bits are in the page directory */ -if (amdgpu_vm_block_size ==-1 ) { - -/* Total bits covered by PD + PTs */ -unsigned bits =ilog2 (amdgpu_vm_size) +18 ; - -/* Make sure the PD is 4K in size up to 8GB address space. -Above that split equal between PD and PTs */ -if (amdgpu_vm_size <=8 ) - amdgpu_vm_block_size = bits -9 ; -else - amdgpu_vm_block_size = (bits +3 ) /2 ; +if (amdgpu_vm_block_size ==-1 ) +return ; - } else if (amdgpu_vm_block_size < 9) { +if (amdgpu_vm_block_size <9 ) {dev_warn (adev->dev,"VM page table size (%d) too small\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; }if (amdgpu_vm_block_size >24 || (amdgpu_vm_size *1024 ) < (1ull << amdgpu_vm_block_size)) {dev_warn (adev->dev,"VM page table size (%d) too large\n" , amdgpu_vm_block_size); - amdgpu_vm_block_size =9 ; + goto def_value; } + +return ; + +def_value: + amdgpu_vm_block_size =-1 ; }static void amdgpu_check_vm_size (struct amdgpu_device *adev)
@@ -1096,8 +1092,7 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev)return ; def_value: - amdgpu_vm_size =8 ; -dev_info (adev->dev,"set default VM size %dGB\n" , amdgpu_vm_size); + amdgpu_vm_size =-1 ; }/**
@@ -1131,7 +1126,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev)amdgpu_check_vm_size (adev); -amdgpu_get_block_size (adev); +amdgpu_check_block_size (adev);if (amdgpu_vram_page_split !=-1 && (amdgpu_vram_page_split <16 || !amdgpu_check_pot_argument (amdgpu_vram_page_split))) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -86,7 +86,7 @@unsigned amdgpu_ip_block_mask =0xffffffff ;int amdgpu_bapm =-1 ;int amdgpu_deep_color =0 ; -int amdgpu_vm_size =64 ; +int amdgpu_vm_size =-1 ;int amdgpu_vm_block_size =-1 ;int amdgpu_vm_fault_stop =0 ;int amdgpu_vm_debug =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
@@ -2064,6 +2064,44 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, } } +static uint32_t amdgpu_get_block_size(uint64_t vm_size)
Please rename that to amdgpu_vm_get_block_size().
+{
+ /* Total bits covered by PD + PTs */
+ unsigned bits = ilog2(vm_size) + 18;
+
+ /* Make sure the PD is 4K in size up to 8GB address space.
+ Above that split equal between PD and PTs */
+ if (vm_size <= 8)
+ return (bits - 9);
+ else
+ return ((bits + 3) / 2);
+}
+
+/**
+ * amdgpu_vm_adjust_size - adjust vm size and block size
+ *
+ * @adev: amdgpu_device pointer
+ * @vm_size: the default vm size if it's set auto
+ */
+void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size) +{
+ /* adjust vm size firstly */
+ if (amdgpu_vm_size == -1)
+ adev->vm_manager.vm_size = vm_size;
+ else
+ adev->vm_manager.vm_size = amdgpu_vm_size;
+
+ /* block size depends on vm size */
+ if (amdgpu_vm_block_size == -1)
+ adev->vm_manager.block_size =
+ amdgpu_get_block_size(adev->vm_manager.vm_size);
+ else
+ adev->vm_manager.block_size = amdgpu_vm_block_size;
+
+ DRM_INFO("vm size is %llu GB, block size is %u-bit\n",
+ adev->vm_manager.vm_size, adev->vm_manager.block_size);
+}
+
/**
* amdgpu_vm_init - initialize a vm instance
*
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -0
@@ -234,5 +234,6 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size);#endif
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -3
@@ -849,13 +849,9 @@ static int gmc_v6_0_sw_init(void *handle)if (r)return r; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size); - adev->mc.mc_mask = 0xffffffffffULL; adev->need_dma32 = false;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -4
@@ -1003,13 +1003,9 @@ static int gmc_v7_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; - DRM_INFO("vm size is %d GB, block size is %d-bit\n", - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space.
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -4
@@ -1087,13 +1087,9 @@ static int gmc_v8_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; - DRM_INFO("vm size is %d GB, block size is %d-bit\n", - adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space.
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -2
@@ -552,8 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)if (adev->flags &AMD_IS_APU ) { adev->mc.vram_type =AMDGPU_VRAM_TYPE_UNKNOWN ; - adev->vm_manager.vm_size = amdgpu_vm_size; - adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 );
Make sure we also use 1 level page tables in the APU case as well.
I also flashed a idea about it.
Does APU still uses 1 level page now for gmc v9?
Jerry
With that done and the function renamed the patch is Reviewed-by: Christian König <[email protected]<mailto:[email protected]>>.
Regards,
Christian.
} else {
/* XXX Don't know how to get VRAM type yet. */ adev->mc.vram_type = AMDGPU_VRAM_TYPE_HBM;
@@ -564,11 +563,11 @@ static int gmc_v9_0_sw_init(void *handle)
*/
adev->vm_manager.vm_size = 1U << 18; adev->vm_manager.block_size = 9;
+ DRM_INFO("vm size is %llu GB, block size is %u-bit\n",
+ adev->vm_manager.vm_size,
+ adev->vm_manager.block_size);
}
- DRM_INFO("vm size is %d GB, block size is %d-bit\n",
- adev->vm_manager.vm_size, adev->vm_manager.block_size); -
/* This interrupt is VMC page fault.*/
r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0, &adev->mc.vm_fault);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 51C2AE07-B2D3-4A81-97FE-A79BDA5DBB8D-5C7GfCeVMHo@public.gmane.org
Quoted 232 lines · Jerry
Quoted 223 lines · 在 2017年4月6日,20:07,Christian König…
Am 06.04.2017 um 12:19 schrieb Junwei Zhang:
Quoted 6 lines
By default, the value is set by individual gmc.
if a specific value is input, it overrides the global value for allv2: create helper funcs
Signed-off-by Junwei Zhang <[email protected] <mailto:[email protected]>>A few minor issues below, but apart from that looks good to me.
Quoted 94 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 31 ++++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 38 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 ++++--- 8 files changed, 60 insertions(+), 39 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5
-12@@ -1039,35 +1039,31 @@ static bool amdgpu_check_pot_argument(int arg)return (arg & (arg -1 )) ==0 ; } -static void amdgpu_get_block_size(struct amdgpu_device *adev) +static void amdgpu_check_block_size(struct amdgpu_device *adev) {/* defines number of bits in page table versus page directory, * a page is 4KB so we have 12 bits offset, minimum 9 bits in the * page table and the remaining bits are in the page directory */ -if (amdgpu_vm_block_size ==-1 ) { - -/* Total bits covered by PD + PTs */ -unsigned bits =ilog2 (amdgpu_vm_size) +18 ; - -/* Make sure the PD is 4K in size up to 8GB address space. -Above that split equal between PD and PTs */ -if (amdgpu_vm_size <=8 ) -amdgpu_vm_block_size = bits -9 ; -else -amdgpu_vm_block_size = (bits +3 ) /2 ; +if (amdgpu_vm_block_size ==-1 ) +return ; -} else if (amdgpu_vm_block_size < 9) { +if (amdgpu_vm_block_size <9 ) {dev_warn (adev->dev,"VM page table size (%d) too small\n" , amdgpu_vm_block_size); -amdgpu_vm_block_size =9 ; +goto def_value; }if (
amdgpu_vm_block_size> 24 ||
(amdgpu_vm_size* 1024) < (1ull <<amdgpu_vm_block_size)) {dev_warn(adev->dev, "VM page table size (%d) too large\n", amdgpu_vm_block_size);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1-amdgpu_vm_block_size =9 ; +goto def_value;}
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7
-2+ +return ; + +def_value: +amdgpu_vm_block_size =-1 ; }static void amdgpu_check_vm_size (struct amdgpu_device *adev)@@ -1096,8 +1092,7 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev) return; def_value: -amdgpu_vm_size =8 ; -dev_info (adev->dev,"set default VM size %dGB\n" , amdgpu_vm_size); +amdgpu_vm_size =-1 ; }/** @@ -1131,7 +1126,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev)amdgpu_check_vm_size (adev ); -amdgpu_get_block_size (adev); +amdgpu_check_block_size (adev);if (
amdgpu_vram_page_split!= -1 && (amdgpu_vram_page_split< 16 ||
!amdgpu_check_pot_argument(amdgpu_vram_page_split))) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-1@@ -86,7 +86,7 @@unsigned amdgpu_ip_block_mask =0xffffffff ;int amdgpu_bapm =-1 ;int amdgpu_deep_color =0 ; -int amdgpu_vm_size =64 ; +int amdgpu_vm_size =-1 ;int amdgpu_vm_block_size =-1 ;int amdgpu_vm_fault_stop =0 ;int amdgpu_vm_debug =0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c void amdgpu_vm_bo_invalidate(struct · line 2067
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0@@ -2064,6 +2064,44 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, } } +static uint32_t amdgpu_get_block_size(uint64_t vm_size)Please rename that to
amdgpu_vm_get_block_size().Quoted 109 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +37
-0+{ +/* Total bits covered by PD + PTs */ +unsigned bits =ilog2 (vm_size) +18 ; + +/* Make sure the PD is 4K in size up to 8GB address space. +Above that split equal between PD and PTs */ +if (vm_size <=8 ) +return (bits -9 ); +else +return ((bits +3 ) /2 ); +} + +/** +* amdgpu_vm_adjust_size - adjust vm size and block size +* +* @adev: amdgpu_device pointer +* @vm_size: the default vm size if it's set auto +*/ +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size) +{ +/* adjust vm size firstly */ +if (amdgpu_vm_size ==-1 ) +adev->vm_manager.vm_size = vm_size; +else +adev->vm_manager.vm_size = amdgpu_vm_size; + +/* block size depends on vm size */ +if (amdgpu_vm_block_size ==-1 ) +adev->vm_manager.block_size = +amdgpu_get_block_size (adev->vm_manager.vm_size); +else +adev->vm_manager.block_size = amdgpu_vm_block_size; + +DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , +adev->vm_manager.vm_size, adev->vm_manager.block_size); +} +/** * amdgpu_vm_init - initialize a vm instance * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-0@@ -234,5 +234,6 @@ int amdgpu_vm_bo_clear_mappings(structamdgpu_device *adev, uint64_t saddr, uint64_t size);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); +void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size);#endifdrivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1
-3@@ -849,13 +849,9 @@ static int gmc_v6_0_sw_init(void *handle)if (r)return r; -adev->vm_manager.vm_size = amdgpu_vm_size; -adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , -adev->vm_manager.vm_size, adev->vm_manager.block_size); - adev->mc.mc_mask = 0xffffffffffULL; adev->need_dma32 = false;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-4@@ -1003,13 +1003,9 @@ static int gmc_v7_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ -adev->vm_manager.vm_size = amdgpu_vm_size; -adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO("vm size is %d GB, block size is %d-bit\n", -adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space. drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-4@@ -1087,13 +1087,9 @@ static int gmc_v8_0_sw_init(void *handle)* Currently set to 4GB ((1 << 20) 4k pages). * Max GPUVM size for cayman and SI is 40 bits. */ -adev->vm_manager.vm_size = amdgpu_vm_size; -adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; -DRM_INFO("vm size is %d GB, block size is %d-bit\n", -adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* Set the internal MC address mask * This is the max address of the GPU's * internal address space. drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static int gmc_v9_0_sw_init(void *handle) · line 554
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-2@@ -552,8 +552,7 @@ static int gmc_v9_0_sw_init(void *handle)if (adev->flags &AMD_IS_APU ) { adev->mc.vram_type =AMDGPU_VRAM_TYPE_UNKNOWN ; -adev->vm_manager.vm_size = amdgpu_vm_size; -adev->vm_manager.block_size = amdgpu_vm_block_size; +amdgpu_vm_adjust_size (adev,64 );Make sure we also use 1 level page tables in the APU case as well.
Quoted 2 lines
I also flashed a idea about it.
Does APU still uses 1 level page now for gmc v9?
No, it's same as Vega.
David
Quoted 25 lines
Jerry
Quoted 22 lines
With that done and the function renamed the patch is Reviewed-by: Christian König <[email protected] <mailto:[email protected]>>.
Regards,
Christian.Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-2}else {/* XXX Don't know how to get VRAM type yet. */ adev->mc.vram_type =AMDGPU_VRAM_TYPE_HBM ;@@ -564,11 +563,11 @@ static int gmc_v9_0_sw_init(void *handle)*/ adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; +DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , +adev->vm_manager.vm_size, +adev->vm_manager.block_size); } -DRM_INFO ("vm size is %d GB, block size is %d-bit\n" , -adev->vm_manager.vm_size, adev->vm_manager.block_size); -/* This interrupt is VMC page fault.*/ r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0,
Quoted 8 lines
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static int gmc_v9_0_sw_init(void *handle) · line 573
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0&adev->mc.vm_fault);_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx