drm/amd/amdgpu: add fragment size in vm_manager
Subsystems (2)
PATCH 1/2 drm/amd/amdgpu: add fragment size in vm_manager
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +----- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 5 +++-- 9 files changed, 33 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -4
@@ -590,11 +590,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.virtual_address_offset =AMDGPU_VA_RESERVED_SIZE ; dev_info.virtual_address_max = (uint64_t )adev->vm_manager.max_pfn *AMDGPU_GPU_PAGE_SIZE ; dev_info.virtual_address_alignment =max ((int )PAGE_SIZE ,AMDGPU_GPU_PAGE_SIZE ); - dev_info.pte_fragment_size = - (1 <<AMDGPU_LOG2_PAGES_PER_FRAG (adev)) * -AMDGPU_GPU_PAGE_SIZE ; + dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) *AMDGPU_GPU_PAGE_SIZE ; dev_info.gart_page_size =AMDGPU_GPU_PAGE_SIZE ; - dev_info.cu_active_number = adev->gfx.cu_info.number; dev_info.cu_ao_mask = adev->gfx.cu_info.ao_cu_mask; dev_info.ce_ram_size = adev->gfx.ce_ram_size;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -3
@@ -1419,9 +1419,7 @@ static int amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params,* Userspace can support this by aligning virtual base address and * allocation size to the fragment size. */ - -/* SI and newer are optimized for 64KB */ -unsigned pages_per_frag =AMDGPU_LOG2_PAGES_PER_FRAG (params->adev); +unsigned pages_per_frag = params->adev->vm_manager.fragment_size;uint64_t frag_flags =AMDGPU_PTE_FRAG (pages_per_frag);uint64_t frag_align =1 << pages_per_frag;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -5
@@ -50,11 +50,6 @@ struct amdgpu_bo_list_entry;/* PTBs (Page Table Blocks) need to be aligned to 32K */ #define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -/* LOG2 number of continuous pages for the fragment field */ -#define AMDGPU_LOG2_PAGES_PER_FRAG (adev) \ - ((adev)->asic_type < CHIP_VEGA10 ? 4 : \ - (adev)->vm_manager.block_size) -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2)
@@ -191,6 +186,7 @@ struct amdgpu_vm_manager {uint32_t num_level;uint64_t vm_size;uint32_t block_size; +uint32_t fragment_size;/* vram base address for page table entry */ u64 vram_base_offset;/* vm pte handling */
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3 -2
@@ -124,7 +124,7 @@ static void gfxhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void gfxhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL);
@@ -143,8 +143,9 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp);
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +6 -2
@@ -461,6 +461,7 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v6_0_gart_enable (struct amdgpu_device *adev) {int r, i; +u32 field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );
@@ -488,10 +489,12 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)WREG32 (mmVM_L2_CNTL2,VM_L2_CNTL2__INVALIDATE_ALL_L1_TLBS_MASK |VM_L2_CNTL2__INVALIDATE_L2_CACHE_MASK ); + + field = adev->vm_manager.fragment_size;WREG32 (mmVM_L2_CNTL3,VM_L2_CNTL3__L2_CACHE_BIGK_ASSOCIATIVITY_MASK | - (4UL <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | - (4UL <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT )); + (field <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | + (field <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT ));/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12 );
@@ -812,6 +815,7 @@ static int gmc_v6_0_sw_init(void *handle)return r;amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; adev->mc.mc_mask =0xffffffffffULL ;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +6 -3
@@ -562,7 +562,7 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v7_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );
@@ -592,10 +592,12 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (0 ,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,4 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE , field);WREG32 (mmVM_L2_CNTL3, tmp);/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 );
@@ -949,6 +951,7 @@ static int gmc_v7_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +6 -3
@@ -762,7 +762,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v8_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );
@@ -793,10 +793,12 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,4 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE , field);WREG32 (mmVM_L2_CNTL3, tmp);/* XXX: set to enable PTE/PDE in system memory */ tmp =RREG32 (mmVM_L2_CNTL4);
@@ -1047,6 +1049,7 @@ static int gmc_v8_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6 -2
@@ -541,10 +541,12 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ; }else {/* vm_size is 64GB for legacy 2-level page support*/ amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.num_level =1 ; + adev->vm_manager.fragment_size =9 ; }break ;case CHIP_VEGA10 :
@@ -558,14 +560,16 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ;break ;default :break ; } -DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , +DRM_INFO ("vm size is %llu GB, block size is %u-bit,fragment size is %u-bit\n" , adev->vm_manager.vm_size, - adev->vm_manager.block_size); + adev->vm_manager.block_size, + adev->vm_manager.fragment_size);/* This interrupt is VMC page fault.*/ r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0,
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3 -2
@@ -138,7 +138,7 @@ static void mmhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void mmhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL);
@@ -157,8 +157,9 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1502786126-22831-1-git-send-email-Hongbo.He-5C7GfCeVMHo@public.gmane.org
Only two nit picks, the first one is that we need a better commit message.
Something like: "This adds the fragment_size in the vm_manager structure and implements hardware setup for it."
For the second see below.
Am 15.08.2017 um 10:35 schrieb Roger He:
Quoted 158 lines
Change-Id If8de884538b8eca2214f21242925d854e16e63b7Signed-off-by Roger He <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +----- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 5 +++-- 9 files changed, 33 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-4@@ -590,11 +590,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.virtual_address_offset =AMDGPU_VA_RESERVED_SIZE ; dev_info.virtual_address_max = (uint64_t )adev->vm_manager.max_pfn *AMDGPU_GPU_PAGE_SIZE ; dev_info.virtual_address_alignment =max ((int )PAGE_SIZE ,AMDGPU_GPU_PAGE_SIZE ); - dev_info.pte_fragment_size = - (1 <<AMDGPU_LOG2_PAGES_PER_FRAG (adev)) * -AMDGPU_GPU_PAGE_SIZE ; + dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) *AMDGPU_GPU_PAGE_SIZE ; dev_info.gart_page_size =AMDGPU_GPU_PAGE_SIZE ; - dev_info.cu_active_number = adev->gfx.cu_info.number; dev_info.cu_ao_mask = adev->gfx.cu_info.ao_cu_mask; dev_info.ce_ram_size = adev->gfx.ce_ram_size;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -1419,9 +1419,7 @@ static int amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params,* Userspace can support this by aligning virtual base address and * allocation size to the fragment size. */ - -/* SI and newer are optimized for 64KB */ -unsigned pages_per_frag =AMDGPU_LOG2_PAGES_PER_FRAG (params->adev); +unsigned pages_per_frag = params->adev->vm_manager.fragment_size;uint64_t frag_flags =AMDGPU_PTE_FRAG (pages_per_frag);uint64_t frag_align =1 << pages_per_frag;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-5@@ -50,11 +50,6 @@ struct amdgpu_bo_list_entry;/* PTBs (Page Table Blocks) need to be aligned to 32K */ #define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -/* LOG2 number of continuous pages for the fragment field */ -#define AMDGPU_LOG2_PAGES_PER_FRAG (adev) \ - ((adev)->asic_type < CHIP_VEGA10 ? 4 : \ - (adev)->vm_manager.block_size) -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2)@@ -191,6 +186,7 @@ struct amdgpu_vm_manager {uint32_t num_level;uint64_t vm_size;uint32_t block_size; +uint32_t fragment_size;/* vram base address for page table entry */ u64 vram_base_offset;/* vm pte handling */ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3
-2@@ -124,7 +124,7 @@ static void gfxhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void gfxhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL);@@ -143,8 +143,9 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp);drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +6
-2@@ -461,6 +461,7 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v6_0_gart_enable (struct amdgpu_device *adev) {int r, i; +u32 field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -488,10 +489,12 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)WREG32 (mmVM_L2_CNTL2,VM_L2_CNTL2__INVALIDATE_ALL_L1_TLBS_MASK |VM_L2_CNTL2__INVALIDATE_L2_CACHE_MASK ); + + field = adev->vm_manager.fragment_size;WREG32 (mmVM_L2_CNTL3,VM_L2_CNTL3__L2_CACHE_BIGK_ASSOCIATIVITY_MASK | - (4UL <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | - (4UL <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT )); + (field <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | + (field <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT ));/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 );WREG32 (mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12 );@@ -812,6 +815,7 @@ static int gmc_v6_0_sw_init(void *handle)return r;amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; adev->mc.mc_mask =0xffffffffffULL ;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +5
-3@@ -562,7 +562,7 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v7_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -592,10 +592,12 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (0 ,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,4 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE , field);WREG32 (mmVM_L2_CNTL3, tmp);/* setup context0 */ WREG32 (mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >>12 );
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_sw_init(void *handle) · line 954
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0@@ -949,6 +951,7 @@ static int gmc_v7_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ;
I knew that this gets removed with the next patch, but just to avoid breaking bisecting, use "adev->asic_type < CHIP_VEGA10 ? 4 : 9" here.
With that fixed the patch is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 89 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-0adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +6
-3@@ -762,7 +762,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v8_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -793,10 +793,12 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,4 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE , field);WREG32 (mmVM_L2_CNTL3, tmp);/* XXX: set to enable PTE/PDE in system memory */ tmp =RREG32 (mmVM_L2_CNTL4);@@ -1047,6 +1049,7 @@ static int gmc_v8_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6
-2@@ -541,10 +541,12 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ; }else {/* vm_size is 64GB for legacy 2-level page support*/ amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.num_level =1 ; + adev->vm_manager.fragment_size =9 ; }break ;case CHIP_VEGA10 :@@ -558,14 +560,16 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ;break ;default :break ; } -DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , +DRM_INFO ("vm size is %llu GB, block size is %u-bit,fragment size is %u-bit\n" , adev->vm_manager.vm_size, - adev->vm_manager.block_size); + adev->vm_manager.block_size, + adev->vm_manager.fragment_size);/* This interrupt is VMC page fault.*/ r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0,drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-1@@ -138,7 +138,7 @@ static void mmhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void mmhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL);
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) · line 165
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-1@@ -157,8 +157,9 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);
_______________________________________________
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): 6a5af961-bd4d-4219-b68a-3302abebf460-5C7GfCeVMHo@public.gmane.org
Am 15.08.2017 um 10:42 schrieb Christian König:
Quoted 173 lines
Only two nit picks, the first one is that we need a better commit message.
Something like: "This adds the
fragment_sizein thevm_managerstructure and implements hardware setup for it."For the second see below.
Am 15.08.2017 um 10:35 schrieb Roger He:
Quoted 166 lines
Change-Id If8de884538b8eca2214f21242925d854e16e63b7Signed-off-by Roger He <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +----- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 ++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 5 +++-- 9 files changed, 33 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-4@@ -590,11 +590,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file dev_info.virtual_address_offset =AMDGPU_VA_RESERVED_SIZE ; dev_info.virtual_address_max = (uint64_t )adev->vm_manager.max_pfn *AMDGPU_GPU_PAGE_SIZE ; dev_info.virtual_address_alignment =max ((int )PAGE_SIZE ,AMDGPU_GPU_PAGE_SIZE ); - dev_info.pte_fragment_size = - (1 <<AMDGPU_LOG2_PAGES_PER_FRAG (adev)) * -AMDGPU_GPU_PAGE_SIZE ; + dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) *AMDGPU_GPU_PAGE_SIZE ; dev_info.gart_page_size =AMDGPU_GPU_PAGE_SIZE ; - dev_info.cu_active_number = adev->gfx.cu_info.number; dev_info.cu_ao_mask = adev->gfx.cu_info.ao_cu_mask; dev_info.ce_ram_size = adev->gfx.ce_ram_size;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-3@@ -1419,9 +1419,7 @@ static int amdgpu_vm_frag_ptes(structamdgpu_pte_update_params *params, * Userspace can support this by aligning virtual base address and * allocation size to the fragment size. */ - -/* SI and newer are optimized for 64KB */ -unsigned pages_per_frag =AMDGPU_LOG2_PAGES_PER_FRAG (params->adev); +unsigned pages_per_frag = params->adev->vm_manager.fragment_size;uint64_t frag_flags =AMDGPU_PTE_FRAG (pages_per_frag);uint64_t frag_align =1 << pages_per_frag;diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.hb/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.hindex 6e94cd2..d426384 100644drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-4@@ -50,11 +50,6 @@ struct amdgpu_bo_list_entry;/* PTBs (Page Table Blocks) need to be aligned to 32K */ #define AMDGPU_VM_PTB_ALIGN_SIZE 32768 -/* LOG2 number of continuous pages for the fragment field */ -#define AMDGPU_LOG2_PAGES_PER_FRAG (adev) \ - ((adev)->asic_type < CHIP_VEGA10 ? 4 : \ - (adev)->vm_manager.block_size) -#define AMDGPU_PTE_VALID (1ULL << 0)#define AMDGPU_PTE_SYSTEM (1ULL << 1)#define AMDGPU_PTE_SNOOPED (1ULL << 2)@@ -191,6 +186,7 @@ struct amdgpu_vm_manager {uint32_t num_level;uint64_t vm_size;uint32_t block_size; +uint32_t fragment_size;/* vram base address for page table entry */ u64 vram_base_offset;/* vm pte handling */ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +2
-2@@ -124,7 +124,7 @@ static void gfxhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void gfxhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL);@@ -143,8 +143,9 @@ static void gfxhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_FRAGMENT_SIZE ,6 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index ab0a104..dcb053f 100644drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +5
-2@@ -461,6 +461,7 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v6_0_gart_enable (struct amdgpu_device *adev) {int r, i; +u32 field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -488,10 +489,12 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev) WREG32(mmVM_L2_CNTL2, VM_L2_CNTL2__INVALIDATE_ALL_L1_TLBS_MASK |VM_L2_CNTL2__INVALIDATE_L2_CACHE_MASK ); + + field = adev->vm_manager.fragment_size;WREG32 (mmVM_L2_CNTL3,VM_L2_CNTL3__L2_CACHE_BIGK_ASSOCIATIVITY_MASK | - (4UL <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | - (4UL <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT )); + (field <<VM_L2_CNTL3__BANK_SELECT__SHIFT ) | + (field <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT ));/* setup context0 */ WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_startQuoted 1 line
Quoted 1 line
12);
WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >>12);
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1
-0@@ -812,6 +815,7 @@ static int gmc_v6_0_sw_init(void *handle)return r;amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ; adev->mc.mc_mask =0xffffffffffULL ;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +5
-3@@ -562,7 +562,7 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v7_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -592,10 +592,12 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (0 ,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 , L2_CACHE_BIGK_FRAGMENT_SIZE, 4); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,L2_CACHE_BIGK_FRAGMENT_SIZE, field); WREG32(mmVM_L2_CNTL3, tmp); /* setup context0 */ WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_sw_init(void *handle) · line 954
Quoted 6 lines
Quoted 1 line
Quoted 1 line
12);
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0@@ -949,6 +951,7 @@ static int gmc_v7_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ;I knew that this gets removed with the next patch, but just to avoid breaking bisecting, use "
adev->asic_type<CHIP_VEGA10? 4 : 9" here.
My fault, just seen that this is GFX7 specific code. So just forget this comment.
Christian.
Quoted 104 lines
With that fixed the patch is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.Quoted 97 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-0adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +5
-3@@ -762,7 +762,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)static int gmc_v8_0_gart_enable (struct amdgpu_device *adev) {int r, i; -u32 tmp; +u32 tmp, field;if (adev->gart.robj ==NULL ) {dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );@@ -793,10 +793,12 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_ALL_L1_TLBS ,1 ); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32 (mmVM_L2_CNTL2, tmp); + + field = adev->vm_manager.fragment_size; tmp =RREG32 (mmVM_L2_CNTL3); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,L2_CACHE_BIGK_ASSOCIATIVITY ,1 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,4 ); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 , L2_CACHE_BIGK_FRAGMENT_SIZE, 4); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); + tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,L2_CACHE_BIGK_FRAGMENT_SIZE, field); WREG32(mmVM_L2_CNTL3, tmp); /* XXX: set to enable PTE/PDE in system memory */ tmp = RREG32(mmVM_L2_CNTL4);drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-0@@ -1047,6 +1049,7 @@ static int gmc_v8_0_sw_init(void *handle)* Max GPUVM size for cayman and SI is 40 bits. */ amdgpu_vm_adjust_size (adev,64 ); + adev->vm_manager.fragment_size =4 ; adev->vm_manager.max_pfn = adev->vm_manager.vm_size <<18 ;/* Set the internal MC address mask drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6
-1@@ -541,10 +541,12 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ; }else {/* vm_size is 64GB for legacy 2-level page support*/ amdgpu_vm_adjust_size (adev,64 ); adev->vm_manager.num_level =1 ; + adev->vm_manager.fragment_size =9 ; }break ;case CHIP_VEGA10 :@@ -558,14 +560,16 @@ static int gmc_v9_0_sw_init(void *handle) adev->vm_manager.vm_size =1U <<18 ; adev->vm_manager.block_size =9 ; adev->vm_manager.num_level =3 ; + adev->vm_manager.fragment_size =9 ;break ;default :break ; } -DRM_INFO ("vm size is %llu GB, block size is %u-bit\n" , + DRM_INFO("vm size is %llu GB, block size is %u-bit,fragment size is %u-bit\n", adev->vm_manager.vm_size, - adev->vm_manager.block_size); + adev->vm_manager.block_size, + adev->vm_manager.fragment_size);/* This interrupt is VMC page fault.*/ r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0,drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +2
-2@@ -138,7 +138,7 @@ static void mmhub_v1_0_init_tlb_regs(struct amdgpu_device *adev)static void mmhub_v1_0_init_cache_regs (struct amdgpu_device *adev) { -uint32_t tmp; +uint32_t tmp, field;/* Setup L2 cache */ tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL);@@ -157,8 +157,9 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); + field = adev->vm_manager.fragment_size; tmp = mmVM_L2_CNTL3_DEFAULT; - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,9 ); + tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT , field); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c static void mmhub_v1_0_init_cache_regs(struct
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0
-0L2_CACHE_BIGK_FRAGMENT_SIZE, 6);WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp);_______________________________________________
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