drm/amd/amdgpu: L1 Policy(1/5) - removed VM settgings for mmhub and gfxhub from VF
Subsystems (2)
PATCH 1/5 drm/amd/amdgpu: L1 Policy(1/5) - removed VM settgings for mmhub and gfxhub from VF
From: Zhigang Luo <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 ++-- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 74 ++++++++++++++----------- 2 files changed, 48 insertions(+), 37 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6 -5
@@ -1308,11 +1308,12 @@ static int gmc_v9_0_hw_init(void *handle) value = true;gfxhub_v1_0_set_fault_enable_default (adev, value); -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_set_fault_enable_default (adev, value); -else -mmhub_v1_0_set_fault_enable_default (adev, value); - +if (!amdgpu_sriov_vf (adev)) { +if (adev->asic_type ==CHIP_ARCTURUS ) +mmhub_v9_4_set_fault_enable_default (adev, value); +else +mmhub_v1_0_set_fault_enable_default (adev, value); + }for (i =0 ; i < adev->num_vmhubs; ++i)gmc_v9_0_flush_gpu_tlb (adev,0 , i,0 );
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +42 -32
97 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/5 drm/amd/amdgpu: L1 Policy(2/5) - removed GC GRBM violations from gfxhub
From: Zhigang Luo <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 79 +++++++++++++----------- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 2 files changed, 44 insertions(+), 37 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +43 -36
@@ -75,40 +75,45 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)WREG32_SOC15_RLC (GC ,0 , mmMC_VM_AGP_BOT, adev->gmc.agp_start >>24 );WREG32_SOC15_RLC (GC ,0 , mmMC_VM_AGP_TOP, adev->gmc.agp_end >>24 ); -/* Program the system aperture low logical page number. */ -WREG32_SOC15_RLC (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, -min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ); - -if (adev->asic_type ==CHIP_RAVEN && adev->rev_id >=0x8 ) -/* -* Raven2 has a HW issue that it is unable to use the vram which -* is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the -* workaround that increase system aperture high address (add 1) -* to get rid of the VM fault and hardware hang. -*/ -WREG32_SOC15_RLC (GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, -max ((adev->gmc.fb_end >>18 ) +0x1 , - adev->gmc.agp_end >>18 )); -else -WREG32_SOC15_RLC (GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, -max (adev->gmc.fb_end, adev->gmc.agp_end) >>18 ); - -/* Set default page address. */ - value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start - + adev->vm_manager.vram_base_offset; -WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, - (u32)(value >>12 )); -WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, - (u32)(value >>44 )); - -/* Program "protection fault". */ -WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32, - (u32)(adev->dummy_page_addr >>12 )); -WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, - (u32)((u64 )adev->dummy_page_addr >>44 )); - -WREG32_FIELD15 (GC ,0 ,VM_L2_PROTECTION_FAULT_CNTL2 , -ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); +if (!amdgpu_sriov_vf (adev) || adev->asic_type <=CHIP_VEGA10 ) { +/* Program the system aperture low logical page number. */ +WREG32_SOC15_RLC (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, +min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ); + +if (adev->asic_type ==CHIP_RAVEN && adev->rev_id >=0x8 ) +/* +* Raven2 has a HW issue that it is unable to use the +* vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. +* So here is the workaround that increase system +* aperture high address (add 1) to get rid of the VM +* fault and hardware hang. +*/ +WREG32_SOC15_RLC (GC ,0 , + mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, +max ((adev->gmc.fb_end >>18 ) +0x1 , + adev->gmc.agp_end >>18 )); +else +WREG32_SOC15_RLC ( +GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, +max (adev->gmc.fb_end, adev->gmc.agp_end) >>18 ); + +/* Set default page address. */ + value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start + + adev->vm_manager.vram_base_offset; +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, + (u32)(value >>12 )); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, + (u32)(value >>44 )); + +/* Program "protection fault". */ +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32, + (u32)(adev->dummy_page_addr >>12 )); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, + (u32)((u64 )adev->dummy_page_addr >>44 )); + +WREG32_FIELD15 (GC ,0 ,VM_L2_PROTECTION_FAULT_CNTL2 , +ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); + } }static void gfxhub_v1_0_init_tlb_regs (struct amdgpu_device *adev)
@@ -280,10 +285,12 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)gfxhub_v1_0_init_gart_aperture_regs (adev);gfxhub_v1_0_init_system_aperture_regs (adev);gfxhub_v1_0_init_tlb_regs (adev); -gfxhub_v1_0_init_cache_regs (adev); +if (!amdgpu_sriov_vf (adev)) +gfxhub_v1_0_init_cache_regs (adev);gfxhub_v1_0_enable_system_domain (adev); -gfxhub_v1_0_disable_identity_aperture (adev); +if (!amdgpu_sriov_vf (adev)) +gfxhub_v1_0_disable_identity_aperture (adev);gfxhub_v1_0_setup_vmid_config (adev);gfxhub_v1_0_program_invalidation (adev);
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -1307,8 +1307,8 @@ static int gmc_v9_0_hw_init(void *handle)else value = true; -gfxhub_v1_0_set_fault_enable_default (adev, value);if (!amdgpu_sriov_vf (adev)) { +gfxhub_v1_0_set_fault_enable_default (adev, value);if (adev->asic_type ==CHIP_ARCTURUS )mmhub_v9_4_set_fault_enable_default (adev, value);else
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amd/amdgpu: L1 Policy(3/5) - removed ECC interrupt from VF
In reply to Jane JianFrom: Zhigang Luo <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +11 -7
@@ -398,8 +398,10 @@ static void gmc_v9_0_set_irq_funcs(struct amdgpu_device *adev) adev->gmc.vm_fault.num_types =1 ; adev->gmc.vm_fault.funcs = &gmc_v9_0_irq_funcs; - adev->gmc.ecc_irq.num_types =1 ; - adev->gmc.ecc_irq.funcs = &gmc_v9_0_ecc_funcs; +if (!amdgpu_sriov_vf (adev)) { + adev->gmc.ecc_irq.num_types =1 ; + adev->gmc.ecc_irq.funcs = &gmc_v9_0_ecc_funcs; + } } static uint32_t gmc_v9_0_get_invalidate_req(unsigned int vmid,
@@ -1117,11 +1119,13 @@ static int gmc_v9_0_sw_init(void *handle)if (r)return r; -/* interrupt sent to DF. */ - r =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_DF ,0 , - &adev->gmc.ecc_irq); -if (r) -return r; +if (!amdgpu_sriov_vf (adev)) { +/* interrupt sent to DF. */ + r =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_DF ,0 , + &adev->gmc.ecc_irq); +if (r) +return r; + }/* Set the internal MC address mask * This is the max address of the GPU's
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amd/amdgpu: L1 Policy(4/5) - removed SPI_GDBG_TRAP_CONFIG from VF
In reply to Jane JianFrom: Zhigang Luo <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +13 -0
@@ -2252,6 +2252,19 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)WREG32_SOC15_OFFSET (GC ,0 , mmGDS_GWS_VMID0, i,0 );WREG32_SOC15_OFFSET (GC ,0 , mmGDS_OA_VMID0, i,0 ); } + +if (!amdgpu_sriov_vf (adev)) { + data =0 ; + data =REG_SET_FIELD (data,SPI_GDBG_TRAP_CONFIG , +VMID_SEL , trap_config_vmid_mask); + data =REG_SET_FIELD (data,SPI_GDBG_TRAP_CONFIG , +TRAP_EN ,1 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmSPI_GDBG_TRAP_CONFIG), data); + +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmSPI_GDBG_TRAP_DATA0),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmSPI_GDBG_TRAP_DATA1),0 ); +WREG32 (SOC15_REG_OFFSET (GC ,0 , mmSPI_GDBG_TRAP_MASK),0 ); + } }static void gfx_v9_0_init_gds_vmid (struct amdgpu_device *adev)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amd/amdgpu: L1 Policy(5/5) - removed IH_CHICKEN from VF
In reply to Jane JianFrom: Zhigang Luo <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +12 -10
@@ -234,16 +234,9 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI, (ih->gpu_addr >>40 ) &0xff ); ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN); ih_rb_cntl =vega10_ih_rb_cntl (ih, ih_rb_cntl); -if (adev->irq.ih.use_bus_addr) { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN ,MC_SPACE_GPA_ENABLE ,1 ); - }else { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN ,MC_SPACE_FBPA_ENABLE ,1 ); - } ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RPTR_REARM , !!adev->irq.msi_enabled); -if (amdgpu_sriov_vf (adev)) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) {DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" );
@@ -253,10 +246,19 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); } -if ((adev->asic_type ==CHIP_ARCTURUS - && adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) - || adev->asic_type ==CHIP_RENOIR ) +if ((adev->asic_type ==CHIP_ARCTURUS && + adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) || + adev->asic_type ==CHIP_RENOIR ) { + ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN); +if (adev->irq.ih.use_bus_addr) { + ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , +MC_SPACE_GPA_ENABLE ,1 ); + }else { + ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , +MC_SPACE_FBPA_ENABLE ,1 ); + }WREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN, ih_chicken); + }/* set the writeback address whether it's enabled or not */ WREG32_SOC15(OSSSYS, 0, mmIH_RB_WPTR_ADDR_LO,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 5/5] drm/amd/amdgpu: L1 Policy(5/5) - removed IH_CHICKEN from VF
[AMD Official Use Only - Internal Distribution Only]
Series are Reviewed-by: Emily Deng <[email protected]>
Quoted 69 lines
-----Original Message-----
From: Jane Jian <[email protected]>
Sent: Friday, January 3, 2020 5:57 PM
To: [email protected]; Deng, Emily <[email protected]>; Liu, Leo <[email protected]>
Cc: Jian,JaneQiang) <[email protected]>; Luo, Zhigang <[email protected]>; Jian,JaneQiang) <[email protected]>
Subject: [PATCH 5/5] drm/amd/amdgpu: L1 Policy(5/5) - removedIH_CHICKENfrom VFFrom: Zhigang Luo <[email protected]>
Signed-off-by Zhigang Luo <[email protected]>Signed-off-by Jane Jian <[email protected]>---
drivers/gpu/drm/amd/amdgpu/vega10_ih.c| 22 ++++++++++++----------1 file changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/amdgpu/vega10_ih.c +0
-6@@ -234,16 +234,9 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI, (ih->gpu_addr >>40 ) &0xff ); ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN); ih_rb_cntl =vega10_ih_rb_cntl (ih, ih_rb_cntl); -if (adev->irq.ih.use_bus_addr) { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , MC_SPACE_GPA_ENABLE, 1); - }else { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , MC_SPACE_FBPA_ENABLE, 1); - } ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, RPTR_REARM,!!adev->irq.msi_enabled); - if (amdgpu_sriov_vf(adev)) { if (psp_reg_program(&adev->psp, PSP_REG_IH_RB_CNTL, ih_rb_cntl)) { DRM_ERROR("PSP program IH_RB_CNTL failed!\n");drivers/gpu/drm/amd/amdgpu/vega10_ih.c +12
-3@@ -253,10 +246,19 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); } -if ((adev->asic_type ==CHIP_ARCTURUS - && adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) - || adev->asic_type ==CHIP_RENOIR ) +if ((adev->asic_type ==CHIP_ARCTURUS && + adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) || + adev->asic_type ==CHIP_RENOIR ) { + ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN); +if (adev->irq.ih.use_bus_addr) { + ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , +MC_SPACE_GPA_ENABLE ,1 ); + }else { + ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , +MC_SPACE_FBPA_ENABLE ,1 ); + }WREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN, ih_chicken); + }/* set the writeback address whether it's enabled or not */ WREG32_SOC15(OSSSYS, 0, mmIH_RB_WPTR_ADDR_LO,
Quoted 2 lines
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx