Port various SOC15 drivers over to new macros
Subsystems (2)
This series ports a variety of vega10 drivers over to the new SOC15 macros and introduces a pair of OFFSET ready macros to help with MC related code.
_______________________________________________
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): [email protected]
PATCH 1/10 drm/amd/amdgpu: Add offset variant to SOC15 macros
Allows reading/writing via SOC15 macros with offset for various register banks.
--- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc15_common.h +14 -0
@@ -63,6 +63,13 @@ struct nbio_pcie_index_data { (3 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG3 + reg : \ (ip##_BASE__INST##inst##_SEG4 + reg)))))) +#define RREG32_SOC15_OFFSET (ip, inst, reg, offset) \ + RREG32( (0 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG0 + reg : \ + (1 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG1 + reg : \ + (2 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG2 + reg : \ + (3 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG3 + reg : \ + (ip##_BASE__INST##inst##_SEG4 + reg))))) + offset) +#define WREG32_SOC15 (ip, inst, reg, value) \ WREG32( (0 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG0 + reg : \ (1 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG1 + reg : \
@@ -70,6 +77,13 @@ struct nbio_pcie_index_data { (3 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG3 + reg : \ (ip##_BASE__INST##inst##_SEG4 + reg))))), value) +#define WREG32_SOC15_OFFSET (ip, inst, reg, offset, value) \ + WREG32( (0 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG0 + reg : \ + (1 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG1 + reg : \ + (2 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG2 + reg : \ + (3 == reg##_BASE_IDX ? ip##_BASE__INST##inst##_SEG3 + reg : \ + (ip##_BASE__INST##inst##_SEG4 + reg))))) + offset, value) +#endif
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/10 drm/amd/amdgpu: Port GFXHUB over to new SOC15 macros
In reply to a message not in the archiveNo functional changes in this patch. Simply re-writing read/writes into new macros.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 182 +++++++++++++++---------------- 1 file changed, 91 insertions(+), 91 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +91 -91
@@ -39,38 +39,38 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ /* Update configuration */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), - adev->mc.vram_start >>18 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR), - adev->mc.vram_end >>18 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, + adev->mc.vram_start >>18 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, + adev->mc.vram_end >>18 ); value = adev->vram_scratch.gpu_addr - adev->mc.vram_start + adev->vm_manager.vram_base_offset; -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB), - (u32)(value >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB), - (u32)(value >>44 )); +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 ));if (amdgpu_sriov_vf (adev)) {/* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are VF copy registers so vbios post doesn't program them, for SRIOV driver need to program them */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_BASE), - adev->mc.vram_start >>24 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_LOCATION_TOP), - adev->mc.vram_end >>24 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_FB_LOCATION_BASE, + adev->mc.vram_start >>24 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_FB_LOCATION_TOP, + adev->mc.vram_end >>24 ); }/* Disable AGP. */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BASE),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_TOP),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_AGP_BOT),0xFFFFFFFF ); +WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_BASE,0 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_TOP,0 ); +WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_BOT,0xFFFFFFFF );/* GART Enable. */ /* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,1 ); tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
@@ -96,10 +96,10 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)MC_VM_MX_L1_TLB_CNTL ,ATC_EN , 1); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,1 ); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL,
@@ -118,17 +118,17 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)VM_L2_CNTL ,IDENTITY_MODE_FRAGMENT_SIZE , 0); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2); 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 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL2), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL2, tmp); tmp = mmVM_L2_CNTL3_DEFAULT; -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL4); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL4, VMC_TAP_PDE_REQUEST_PHYSICAL,
@@ -137,22 +137,22 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)VM_L2_CNTL4 ,VMC_TAP_PTE_REQUEST_PHYSICAL , 0); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL4), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL4, tmp);/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), - (u32)(adev->mc.gtt_end >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), - (u32)(adev->mc.gtt_end >>44 )); +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, + (u32)(adev->mc.gtt_start >>12 )); +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, + (u32)(adev->mc.gtt_start >>44 )); + +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, + (u32)(adev->mc.gtt_end >>12 )); +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, + (u32)(adev->mc.gtt_end >>44 ));BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); value = adev->gart.table_addr - adev->mc.vram_start
@@ -160,49 +160,49 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/*valid bit*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); - -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), - (u32)(adev->dummy_page.addr >>12 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32), - (u32)((u64 )adev->dummy_page.addr >>44 )); - - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2)); +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, + (u32 )value); +WREG32_SOC15 (GC ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, + (u32)(value >>32 )); + +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 )); + + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 ,ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL, tmp);/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),0XFFFFFFFF ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32,0XFFFFFFFF ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32,0x0000000F ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32,0 ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32,0 ); +WREG32_SOC15 (GC ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32,0 );for (i =0 ; i <=14 ; i++) { - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL) + i); + tmp =RREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL, i); tmp =REG_SET_FIELD (tmp,VM_CONTEXT1_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT1_CNTL ,PAGE_TABLE_DEPTH , adev->vm_manager.num_level);
@@ -223,13 +223,13 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_CONTEXT1_CNTL ,PAGE_TABLE_BLOCK_SIZE , adev->vm_manager.block_size -9 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL) + i, tmp); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32) + i*2 ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32) + i*2 ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_LO32) + i*2 , -lower_32_bits (adev->vm_manager.max_pfn -1 )); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32) + i*2 , -upper_32_bits (adev->vm_manager.max_pfn -1 )); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_CNTL, i, tmp); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2 ,0 ); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2 ,0 ); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_LO32, i*2 , +lower_32_bits (adev->vm_manager.max_pfn -1 )); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32, i*2 , +upper_32_bits (adev->vm_manager.max_pfn -1 )); }
@@ -243,22 +243,22 @@ void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)/* Disable all tables */ for (i =0 ; i <16 ; i++) -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL) + i,0 ); +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT0_CNTL, i,0 );/* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,0 ); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_ADVANCED_DRIVER_MODEL ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL), tmp); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_CNTL3),0 ); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL, tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3,0 ); }/**
@@ -271,7 +271,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value) {u32 tmp; - tmp =RREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL)); + tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value); tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,
@@ -296,7 +296,7 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT , value); -WREG32 (SOC15_REG_OFFSET (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); +WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); }static int gfxhub_v1_0_early_init (void *handle)
@@ -345,12 +345,12 @@ static int gfxhub_v1_0_hw_init(void *handle)unsigned i;for (i =0 ; i <18 ; ++i) { -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + -2 * i,0xffffffff ); -WREG32 (SOC15_REG_OFFSET (GC ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + -2 * i,0x1f ); +WREG32_SOC15_OFFSET (GC ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32, +2 * i,0xffffffff ); +WREG32_SOC15_OFFSET (GC ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32, +2 * i,0x1f ); }return 0 ;
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/10 drm/amd/amdgpu: Cleanup gfxhub read-modify-write patterns
In reply to a message not in the archiveSwap a couple of read/set/write patterns for WREG32_FIELD15.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +4 -8
@@ -174,11 +174,9 @@ int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, (u32)((u64)adev->dummy_page.addr >> 44)); - tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2); - tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 , -ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY , -1 ); -WREG32_SOC15 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); + +WREG32_FIELD15 (GC ,0 ,VM_L2_PROTECTION_FAULT_CNTL2 , +ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); tmp =RREG32_SOC15 (GC ,0 , mmVM_CONTEXT0_CNTL); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 );
@@ -255,9 +253,7 @@ void gfxhub_v1_0_gart_disable(struct amdgpu_device *adev)WREG32_SOC15 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32_SOC15 (GC ,0 , mmVM_L2_CNTL); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL, tmp); +WREG32_FIELD15 (GC ,0 ,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 );WREG32_SOC15 (GC ,0 , mmVM_L2_CNTL3,0 ); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/10 drm/amd/amdgpu: Port MMHUB over to new SOC15 macros
In reply to a message not in the archiveNo functional changes.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 201 ++++++++++++++++---------------- 1 file changed, 100 insertions(+), 101 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +100 -101
@@ -36,7 +36,7 @@u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) { -u64 base =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE)); +u64 base =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE); base &=MC_VM_FB_LOCATION_BASE__FB_BASE_MASK ; base <<=24 ;
@@ -54,37 +54,37 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)/* Program MC. */ /* Update configuration */ DRM_INFO ("%s -- in\n" , __func__); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR), - adev->mc.vram_start >>18 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR), - adev->mc.vram_end >>18 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR, + adev->mc.vram_start >>18 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR, + adev->mc.vram_end >>18 ); value = adev->vram_scratch.gpu_addr - adev->mc.vram_start + adev->vm_manager.vram_base_offset; -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB), - (u32)(value >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB), - (u32)(value >>44 )); +WREG32_SOC15 (MMHUB ,0 , + mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, + (u32)(value >>12 )); +WREG32_SOC15 (MMHUB ,0 , + mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, + (u32)(value >>44 ));if (amdgpu_sriov_vf (adev)) {/* MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are VF copy registers so vbios post doesn't program them, for SRIOV driver need to program them */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE), - adev->mc.vram_start >>24 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_FB_LOCATION_TOP), - adev->mc.vram_end >>24 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE, + adev->mc.vram_start >>24 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_TOP, + adev->mc.vram_end >>24 ); }/* Disable AGP. */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_BASE),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_TOP),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_AGP_BOT),0x00FFFFFF ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_BASE,0 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_TOP,0 ); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_AGP_BOT,0x00FFFFFF );/* GART Enable. */ /* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,1 ); tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
@@ -110,10 +110,10 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)MC_VM_MX_L1_TLB_CNTL ,ATC_EN , 1); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,1 ); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL,
@@ -132,17 +132,17 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)VM_L2_CNTL ,IDENTITY_MODE_FRAGMENT_SIZE , 0); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL2)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2); 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 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL2), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); tmp = mmVM_L2_CNTL3_DEFAULT; -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL3), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3, tmp); - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL4)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL4); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL4, VMC_TAP_PDE_REQUEST_PHYSICAL,
@@ -151,22 +151,22 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)VM_L2_CNTL4 ,VMC_TAP_PTE_REQUEST_PHYSICAL , 0); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL4), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL4, tmp);/* setup context0 */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32), - (u32)(adev->mc.gtt_start >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32), - (u32)(adev->mc.gtt_start >>44 )); - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32), - (u32)(adev->mc.gtt_end >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32), - (u32)(adev->mc.gtt_end >>44 )); +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, + (u32)(adev->mc.gtt_start >>12 )); +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, + (u32)(adev->mc.gtt_start >>44 )); + +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, + (u32)(adev->mc.gtt_end >>12 )); +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, + (u32)(adev->mc.gtt_end >>44 ));BUG_ON (adev->gart.table_addr & (~0x0000FFFFFFFFF000ULL )); value = adev->gart.table_addr - adev->mc.vram_start +
@@ -174,54 +174,53 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) value &=0x0000FFFFFFFFF000ULL ; value |=0x1 ;/* valid bit */ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32), - (u32 )value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32), - (u32)(value >>32 )); - -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32), - (u32)(adev->dummy_page.addr >>12 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32), - (u32)((u64 )adev->dummy_page.addr >>44 )); - - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2)); +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32, + (u32 )value); +WREG32_SOC15 (MMHUB ,0 , + mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32, + (u32)(value >>32 )); + +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32, + (u32)(adev->dummy_page.addr >>12 )); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, + (u32)((u64 )adev->dummy_page.addr >>44 )); + + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 ,ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); addr =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =RREG32 (addr); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,ENABLE_CONTEXT ,1 ); tmp =REG_SET_FIELD (tmp,VM_CONTEXT0_CNTL ,PAGE_TABLE_DEPTH ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_CONTEXT0_CNTL, tmp); tmp =RREG32 (addr);/* Disable identity aperture.*/ -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32),0XFFFFFFFF ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32),0x0000000F ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_LO32,0XFFFFFFFF ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_LOW_ADDR_HI32,0x0000000F ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32),0 ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_LO32,0 ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT1_IDENTITY_APERTURE_HIGH_ADDR_HI32,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32),0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32),0 ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_LO32,0 ); +WREG32_SOC15 (MMHUB ,0 , + mmVM_L2_CONTEXT_IDENTITY_PHYSICAL_OFFSET_HI32,0 );for (i =0 ; i <=14 ; i++) { - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_CNTL) - + i); + tmp =RREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_CNTL, i); tmp =REG_SET_FIELD (tmp,VM_CONTEXT1_CNTL ,ENABLE_CONTEXT ,1 ); tmp = REG_SET_FIELD(tmp, VM_CONTEXT1_CNTL,
@@ -243,13 +242,13 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_CONTEXT1_CNTL ,PAGE_TABLE_BLOCK_SIZE , adev->vm_manager.block_size -9 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_CNTL) + i, tmp); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32) + i*2 ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32) + i*2 ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_LO32) + i*2 , -lower_32_bits (adev->vm_manager.max_pfn -1 )); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32) + i*2 , -upper_32_bits (adev->vm_manager.max_pfn -1 )); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_CNTL, i, tmp); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32, i*2 ,0 ); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_START_ADDR_HI32, i*2 ,0 ); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_LO32, i*2 , +lower_32_bits (adev->vm_manager.max_pfn -1 )); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32, i*2 , +upper_32_bits (adev->vm_manager.max_pfn -1 )); }return 0 ;
@@ -262,22 +261,22 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)/* Disable all tables */ for (i =0 ; i <16 ; i++) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL) + i,0 ); +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL, i,0 );/* Setup TLB control */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_L1_TLB ,0 ); tmp =REG_SET_FIELD (tmp,MC_VM_MX_L1_TLB_CNTL ,ENABLE_ADVANCED_DRIVER_MODEL ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL), tmp); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_CNTL3),0 ); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL, tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3,0 ); }/**
@@ -289,7 +288,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp; - tmp =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL)); + tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value); tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,
@@ -314,7 +313,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value) WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value); tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL ,EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT , value); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL), tmp); +WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); }static int mmhub_v1_0_early_init (void *handle)
@@ -363,12 +362,12 @@ static int mmhub_v1_0_hw_init(void *handle)unsigned i;for (i =0 ; i <18 ; ++i) { -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32) + -2 * i,0xffffffff ); -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , - mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32) + -2 * i,0x1f ); +WREG32_SOC15_OFFSET (MMHUB ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32, +2 * i,0xffffffff ); +WREG32_SOC15_OFFSET (MMHUB ,0 , + mmVM_INVALIDATE_ENG0_ADDR_RANGE_HI32, +2 * i,0x1f ); }return 0 ;
@@ -409,9 +408,9 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *ad {uint32_t def, data, def1, data1, def2, data2; - def = data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); - def1 = data1 =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB0_CNTL_MISC2)); - def2 = data2 =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB1_CNTL_MISC2)); + def = data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG); + def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2); + def2 = data2 =RREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_MGCG )) { data |=ATC_L2_MISC_CG__ENABLE_MASK ;
@@ -448,13 +447,13 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *ad }if (def != data) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG), data); +WREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data);if (def1 != data1) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB0_CNTL_MISC2), data1); +WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2, data1);if (def2 != data2) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmDAGB1_CNTL_MISC2), data2); +WREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2, data2); } static void athub_update_medium_grain_clock_gating(struct amdgpu_device *adev,
@@ -478,7 +477,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *ade {uint32_t def, data; - def = data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); + def = data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_MC_LS )) data |=ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ;
@@ -486,7 +485,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *ade data &= ~ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ;if (def != data) -WREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG), data); +WREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data); } static void athub_update_medium_grain_light_sleep(struct amdgpu_device *adev,
@@ -543,7 +542,7 @@ static void mmhub_v1_0_get_clockgating_state(void *handle, u32 *flags) *flags |=AMD_CG_SUPPORT_MC_MGCG ;/* AMD_CG_SUPPORT_MC_LS */ - data =RREG32 (SOC15_REG_OFFSET (MMHUB ,0 , mmATC_L2_MISC_CG)); + data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG);if (data &ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_LS ; }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/10 drm/amd/amdgpu: Cleanup mmhub read-modify-write patterns
In reply to a message not in the archiveChange read/set/write patterns into WREG32_FIELD15 calls.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3 -8
@@ -188,11 +188,8 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev) mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32, (u32)((u64)adev->dummy_page.addr >> 44)); - tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2); - tmp =REG_SET_FIELD (tmp,VM_L2_PROTECTION_FAULT_CNTL2 , -ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY , -1 ); -WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); +WREG32_FIELD15 (MMHUB ,0 ,VM_L2_PROTECTION_FAULT_CNTL2 , +ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY ,1 ); addr =SOC15_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT0_CNTL); tmp =RREG32 (addr);
@@ -273,9 +270,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)WREG32_SOC15 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL, tmp);/* Setup L2 cache */ - tmp =RREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL); - tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 ); -WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL, tmp); +WREG32_FIELD15 (MMHUB ,0 ,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL3,0 ); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/10 drm/amd/amdgpu: Port VCE 4.0 over to new SOC15 macros
In reply to a message not in the archiveNote this commit also fixes a few typos in the commented out portions which were missing closing parenthesis on the original coding style.
--- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 176 +++++++++++++++++----------------- 1 file changed, 88 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +88 -88
@@ -118,11 +118,11 @@ static uint64_t vce_v4_0_ring_get_rptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vce.ring[0 ]) -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR);else if (ring == &adev->vce.ring[1 ]) -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR2)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR2);else -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR3)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR3); }/**
@@ -140,11 +140,11 @@ static uint64_t vce_v4_0_ring_get_wptr(struct amdgpu_ring *ring)return adev->wb.wb[ring->wptr_offs];if (ring == &adev->vce.ring[0 ]) -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR);else if (ring == &adev->vce.ring[1 ]) -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR2)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR2);else -return RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR3)); +return RREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR3); }/**
@@ -166,14 +166,14 @@ static void vce_v4_0_ring_set_wptr(struct amdgpu_ring *ring) }if (ring == &adev->vce.ring[0 ]) -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR), -lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR, +lower_32_bits (ring->wptr));else if (ring == &adev->vce.ring[1 ]) -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR2), -lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR2, +lower_32_bits (ring->wptr));else -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR3), -lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR3, +lower_32_bits (ring->wptr)); }static int vce_v4_0_firmware_loaded (struct amdgpu_device *adev)
@@ -183,7 +183,7 @@ static int vce_v4_0_firmware_loaded(struct amdgpu_device *adev)for (i =0 ; i <10 ; ++i) {for (j =0 ; j <100 ; ++j) {uint32_t status = -RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_STATUS)); +RREG32_SOC15 (VCE ,0 , mmVCE_STATUS);if (status &VCE_STATUS_VCPU_REPORT_FW_LOADED_MASK )return 0 ;
@@ -215,29 +215,29 @@ static int vce_v4_0_mmsch_start(struct amdgpu_device *adev, size = header->header_size + header->vce_table_size + header->uvd_table_size;/* 1, write to vce_mmsch_vf_ctx_addr_lo/hi register with GPU mc addr of memory descriptor location */ -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_CTX_ADDR_LO),lower_32_bits (addr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_CTX_ADDR_HI),upper_32_bits (addr)); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_CTX_ADDR_LO,lower_32_bits (addr)); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_CTX_ADDR_HI,upper_32_bits (addr));/* 2, update vmid of descriptor */ - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_VMID)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_VMID); data &= ~VCE_MMSCH_VF_VMID__VF_CTX_VMID_MASK ; data |= (0 <<VCE_MMSCH_VF_VMID__VF_CTX_VMID__SHIFT );/* use domain0 for MM scheduler */ -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_VMID), data); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_VMID, data);/* 3, notify mmsch about the size of this descriptor */ -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_CTX_SIZE), size); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_CTX_SIZE, size);/* 4, set resp to zero */ -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP),0 ); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP,0 );/* 5, kick off the initialization and wait until VCE_MMSCH_VF_MAILBOX_RESP becomes non-zero */ -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_HOST),0x10000001 ); +WREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_HOST,0x10000001 ); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP); loop =1000 ;while ((data &0x10000002 ) !=0x10000002 ) {udelay (10 ); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_MMSCH_VF_MAILBOX_RESP); loop--;if (!loop)break ;
@@ -360,27 +360,27 @@ static int vce_v4_0_start(struct amdgpu_device *adev) ring = &adev->vce.ring[0 ]; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_LO), ring->gpu_addr); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_HI),upper_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_SIZE), ring->ring_size /4 ); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_LO, ring->gpu_addr); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_SIZE, ring->ring_size /4 ); ring = &adev->vce.ring[1 ]; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR2),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR2),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_LO2), ring->gpu_addr); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_HI2),upper_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_SIZE2), ring->ring_size /4 ); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_LO2, ring->gpu_addr); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_SIZE2, ring->ring_size /4 ); ring = &adev->vce.ring[2 ]; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_RPTR3),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_WPTR3),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_LO3), ring->gpu_addr); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_BASE_HI3),upper_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_SIZE3), ring->ring_size /4 ); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_RPTR3,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_WPTR3,lower_32_bits (ring->wptr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_LO3, ring->gpu_addr); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_SIZE3, ring->ring_size /4 );vce_v4_0_mc_resume (adev); WREG32_P(SOC15_REG_OFFSET(VCE, 0, mmVCE_STATUS), VCE_STATUS__JOB_BUSY_MASK,
@@ -602,44 +602,44 @@ static void vce_v4_0_mc_resume(struct amdgpu_device *adev)WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_A),0 , ~(1 <<16 ));WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING),0x1FF000 , ~0xFF9FF000 );WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING),0x3F , ~0x3F ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_B),0x1FF ); +WREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_B,0x1FF ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_CTRL),0x00398000 ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_CTRL,0x00398000 );WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_CACHE_CTRL),0x0 , ~0x1 ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_SWAP_CNTL),0 ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_SWAP_CNTL1),0 ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VM_CTRL),0 ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_SWAP_CNTL,0 ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_SWAP_CNTL1,0 ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VM_CTRL,0 );if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>8 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>40 ) &0xff ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0, + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>8 )); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0, + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCE ].mc_addr >>40 ) &0xff ); }else { -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0), - (adev->vce.gpu_addr >>8 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0), - (adev->vce.gpu_addr >>40 ) &0xff ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR0, + (adev->vce.gpu_addr >>8 )); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR0, + (adev->vce.gpu_addr >>40 ) &0xff ); } offset =AMDGPU_VCE_FIRMWARE_OFFSET ; size =VCE_V4_0_FW_SIZE ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0), offset & ~0x0f000000 ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_SIZE0), size); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET0, offset & ~0x0f000000 ); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_SIZE0, size); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR1), (adev->vce.gpu_addr >>8 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR1), (adev->vce.gpu_addr >>40 ) &0xff ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR1, (adev->vce.gpu_addr >>8 )); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR1, (adev->vce.gpu_addr >>40 ) &0xff ); offset = (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) ? offset + size :0 ; size =VCE_V4_0_STACK_SIZE ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET1), (offset & ~0x0f000000 ) | (1 <<24 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_SIZE1), size); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET1, (offset & ~0x0f000000 ) | (1 <<24 )); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_SIZE1, size); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR2), (adev->vce.gpu_addr >>8 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR2), (adev->vce.gpu_addr >>40 ) &0xff ); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_40BIT_BAR2, (adev->vce.gpu_addr >>8 )); +WREG32_SOC15 (VCE ,0 , mmVCE_LMI_VCPU_CACHE_64BIT_BAR2, (adev->vce.gpu_addr >>40 ) &0xff ); offset += size; size =VCE_V4_0_DATA_SIZE ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET2), (offset & ~0x0f000000 ) | (2 <<24 )); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_VCPU_CACHE_SIZE2), size); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_OFFSET2, (offset & ~0x0f000000 ) | (2 <<24 )); +WREG32_SOC15 (VCE ,0 , mmVCE_VCPU_CACHE_SIZE2, size);WREG32_P (SOC15_REG_OFFSET (VCE ,0 , mmVCE_LMI_CTRL2),0x0 , ~0x100 ); WREG32_P(SOC15_REG_OFFSET(VCE, 0, mmVCE_SYS_INT_EN),
@@ -704,12 +704,12 @@ static bool vce_v4_0_check_soft_reset(void *handle)*/ mutex_lock (&adev->grbm_idx_mutex);WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 ); - if (RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_STATUS) & AMDGPU_VCE_STATUS_BUSY_MASK) { +if (RREG32_SOC15 (VCE ,0 , mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); }WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 ); - if (RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_STATUS) & AMDGPU_VCE_STATUS_BUSY_MASK) { +if (RREG32_SOC15 (VCE ,0 , mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); }
@@ -785,14 +785,14 @@ static void vce_v4_0_override_vce_clock_gating(struct amdgpu_device *adev, bool {u32 tmp, data; - tmp = data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_ARB_CTRL)); + tmp = data =RREG32_SOC15 (VCE ,0 , mmVCE_RB_ARB_CTRL);if (override) data |=VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ;else data &= ~VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ;if (tmp != data) -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_RB_ARB_CTRL), data); +WREG32_SOC15 (VCE ,0 , mmVCE_RB_ARB_CTRL, data); } static void vce_v4_0_set_vce_sw_clock_gating(struct amdgpu_device *adev,
@@ -809,55 +809,55 @@ static void vce_v4_0_set_vce_sw_clock_gating(struct amdgpu_device *adev,fly as necessary. */ if (gated) { - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_B)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_B); data |=0x1ff ; data &= ~0xef0000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_B), data); +WREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_B, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING); data |=0x3ff000 ; data &= ~0xffc00000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2); data |=0x2 ; data &= ~0x00010000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING); data |=0x37f ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL); data |=VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL, data); }else { - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_B)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_B); data &= ~0x80010 ; data |=0xe70008 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_CLOCK_GATING_B), data); +WREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_B, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING); data |=0xffc00000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2); data |=0x10000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING_2, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING); data &= ~0xffc00000 ; -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_REG_CLOCK_GATING, data); - data =RREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL)); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL); data &= ~(VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ); -WREG32 (SOC15_REG_OFFSET (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL), data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_DMA_DCLK_CTRL, data); }vce_v4_0_override_vce_clock_gating (adev, false); }
@@ -899,16 +899,16 @@ static int vce_v4_0_set_clockgating_state(void *handle,if (enable) {/* initialize VCE_CLOCK_GATING_A: Clock ON/OFF delay */ - uint32_t data = RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_CLOCK_GATING_A); +uint32_t data =RREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_A); data &= ~(0xf |0xff0 ); data |= ((0x0 <<0 ) | (0x04 <<4 )); - WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_CLOCK_GATING_A, data); +WREG32_SOC15 (VCE ,0 , mmVCE_CLOCK_GATING_A, data);/* initialize VCE_UENC_CLOCK_GATING: Clock ON/OFF delay */ - data = RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_UENC_CLOCK_GATING); + data =RREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING); data &= ~(0xf |0xff0 ); data |= ((0x0 <<0 ) | (0x04 <<4 )); - WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_UENC_CLOCK_GATING, data); +WREG32_SOC15 (VCE ,0 , mmVCE_UENC_CLOCK_GATING, data); }vce_v4_0_set_vce_sw_clock_gating (adev, enable);
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/10 drm/amd/amdgpu: Port UVD 7.0 over to new SOC15 macros
In reply to a message not in the archiveThis patch also fixes some bugs in commented out code where parenthesis were missing on various SOC15 macros.
--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 206 +++++++++++++++++----------------- 1 file changed, 103 insertions(+), 103 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +103 -103
@@ -53,7 +53,7 @@ static uint64_t uvd_v7_0_ring_get_rptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_RPTR)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_RPTR); }/**
@@ -68,9 +68,9 @@ static uint64_t uvd_v7_0_enc_ring_get_rptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->uvd.ring_enc[0 ]) -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_RPTR)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RB_RPTR);else -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_RPTR2)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RB_RPTR2); }/**
@@ -84,7 +84,7 @@ static uint64_t uvd_v7_0_ring_get_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_WPTR)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_WPTR); }/**
@@ -99,9 +99,9 @@ static uint64_t uvd_v7_0_enc_ring_get_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->uvd.ring_enc[0 ]) -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR);else -return RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR2)); +return RREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR2); }/**
@@ -115,7 +115,7 @@ static void uvd_v7_0_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_WPTR),lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); }/**
@@ -130,11 +130,11 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->uvd.ring_enc[0 ]) -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR), -lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR, +lower_32_bits (ring->wptr));else -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR2), -lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR2, +lower_32_bits (ring->wptr)); }/**
@@ -576,46 +576,46 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)uint32_t offset;if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), -lower_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), -upper_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, +lower_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, +upper_32_bits (adev->firmware.ucode[AMDGPU_UCODE_ID_UVD ].mc_addr)); offset =0 ; }else { -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), -lower_32_bits (adev->uvd.gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), -upper_32_bits (adev->uvd.gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, +lower_32_bits (adev->uvd.gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, +upper_32_bits (adev->uvd.gpu_addr)); offset = size; } -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET0), -AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0), size); - -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW), -lower_32_bits (adev->uvd.gpu_addr + offset)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH), -upper_32_bits (adev->uvd.gpu_addr + offset)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET1), (1 <<21 )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE1),AMDGPU_UVD_HEAP_SIZE ); - -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW), -lower_32_bits (adev->uvd.gpu_addr + offset +AMDGPU_UVD_HEAP_SIZE )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH), -upper_32_bits (adev->uvd.gpu_addr + offset +AMDGPU_UVD_HEAP_SIZE )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET2), (2 <<21 )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE2), -AMDGPU_UVD_STACK_SIZE + (AMDGPU_UVD_SESSION_SIZE *40 )); - -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG), - adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG), - adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DBW_ADDR_CONFIG), - adev->gfx.config.gb_addr_config); - -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_GP_SCRATCH4), adev->uvd.max_handles); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET0, +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0, size); + +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW, +lower_32_bits (adev->uvd.gpu_addr + offset)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH, +upper_32_bits (adev->uvd.gpu_addr + offset)); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET1, (1 <<21 )); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE1,AMDGPU_UVD_HEAP_SIZE ); + +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW, +lower_32_bits (adev->uvd.gpu_addr + offset +AMDGPU_UVD_HEAP_SIZE )); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH, +upper_32_bits (adev->uvd.gpu_addr + offset +AMDGPU_UVD_HEAP_SIZE )); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET2, (2 <<21 )); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE2, +AMDGPU_UVD_STACK_SIZE + (AMDGPU_UVD_SESSION_SIZE *40 )); + +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG, + adev->gfx.config.gb_addr_config); +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG, + adev->gfx.config.gb_addr_config); +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_DBW_ADDR_CONFIG, + adev->gfx.config.gb_addr_config); + +WREG32_SOC15 (UVD ,0 , mmUVD_GP_SCRATCH4, adev->uvd.max_handles); }/**
@@ -658,7 +658,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)mdelay (1 );/* put LMI, VCPU, RBC etc... into reset */ - WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET), + WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET, UVD_SOFT_RESET__LMI_SOFT_RESET_MASK | UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK | UVD_SOFT_RESET__LBSI_SOFT_RESET_MASK |
@@ -670,7 +670,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)mdelay (5 );/* initialize UVD memory controller */ - WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL), + WREG32_SOC15(UVD, 0, mmUVD_LMI_CTRL, (0x40 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) | UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK |
@@ -683,38 +683,38 @@ static int uvd_v7_0_start(struct amdgpu_device *adev) lmi_swap_cntl =0xa ; mp_swap_cntl =0 ;#endif -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_SWAP_CNTL), lmi_swap_cntl); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MP_SWAP_CNTL), mp_swap_cntl); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_SWAP_CNTL, lmi_swap_cntl); +WREG32_SOC15 (UVD ,0 , mmUVD_MP_SWAP_CNTL, mp_swap_cntl); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_MUXA0),0x40c2040 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_MUXA1),0x0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_MUXB0),0x40c2040 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_MUXB1),0x0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_ALU),0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_MPC_SET_MUX),0x88 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_MUXA0,0x40c2040 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_MUXA1,0x0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_MUXB0,0x40c2040 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_MUXB1,0x0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_ALU,0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_MPC_SET_MUX,0x88 );/* take all subblocks out of reset, except VCPU */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SOFT_RESET), -UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_SOC15 (UVD ,0 , mmUVD_SOFT_RESET, +UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK );mdelay (5 );/* enable VCPU clock */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CNTL), -UVD_VCPU_CNTL__CLK_EN_MASK ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CNTL, +UVD_VCPU_CNTL__CLK_EN_MASK );/* enable UMC */ WREG32_P (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_CTRL2),0 , ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK );/* boot up the VCPU */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SOFT_RESET),0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_SOFT_RESET,0 );mdelay (10 );for (i =0 ; i <10 ; ++i) {uint32_t status;for (j =0 ; j <100 ; ++j) { - status =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_STATUS)); + status =RREG32_SOC15 (UVD ,0 , mmUVD_STATUS);if (status &2 )break ;mdelay (10 );
@@ -755,44 +755,44 @@ static int uvd_v7_0_start(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_WPTR_POLL_EN ,0 ); tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_NO_UPDATE ,1 ); tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_RPTR_WR_EN ,1 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_CNTL), tmp); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_CNTL, tmp);/* set the write pointer delay */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_WPTR_CNTL),0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_WPTR_CNTL,0 );/* set the wb address */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_RPTR_ADDR), - (upper_32_bits (ring->gpu_addr) >>2 )); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_RPTR_ADDR, + (upper_32_bits (ring->gpu_addr) >>2 ));/* programm the RB_BASE for ring buffer */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_RBC_RB_64BIT_BAR_LOW), -lower_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH), -upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_RBC_RB_64BIT_BAR_LOW, +lower_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH, +upper_32_bits (ring->gpu_addr));/* Initialize the ring buffer's read and write pointers */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_RPTR),0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_RPTR,0 ); - ring->wptr =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_RPTR)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_WPTR), -lower_32_bits (ring->wptr)); + ring->wptr =RREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_RPTR); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_WPTR, +lower_32_bits (ring->wptr));WREG32_P (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_CNTL),0 , ~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK ); ring = &adev->uvd.ring_enc[0 ]; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_RPTR),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_BASE_LO), ring->gpu_addr); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_BASE_HI),upper_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_SIZE), ring->ring_size /4 ); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_BASE_LO, ring->gpu_addr); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_SIZE, ring->ring_size /4 ); ring = &adev->uvd.ring_enc[1 ]; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_RPTR2),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR2),lower_32_bits (ring->wptr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_BASE_LO2), ring->gpu_addr); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_BASE_HI2),upper_32_bits (ring->gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_SIZE2), ring->ring_size /4 ); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_BASE_LO2, ring->gpu_addr); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_BASE_HI2,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD ,0 , mmUVD_RB_SIZE2, ring->ring_size /4 );return 0 ; }
@@ -807,7 +807,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)static void uvd_v7_0_stop (struct amdgpu_device *adev) {/* force RBC into idle state */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RBC_RB_CNTL),0x11010101 ); +WREG32_SOC15 (UVD ,0 , mmUVD_RBC_RB_CNTL,0x11010101 );/* Stall UMC and register bus before resetting VCPU */ WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2),
@@ -816,12 +816,12 @@ static void uvd_v7_0_stop(struct amdgpu_device *adev)mdelay (1 );/* put VCPU into reset */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SOFT_RESET), -UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_SOC15 (UVD ,0 , mmUVD_SOFT_RESET, +UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK );mdelay (5 );/* disable VCPU clock */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CNTL),0x0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CNTL,0x0 );/* Unstall UMC and register bus */ WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2), 0,
@@ -926,7 +926,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)unsigned i;int r; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID),0xCAFEDEAD ); +WREG32_SOC15 (UVD ,0 , mmUVD_CONTEXT_ID,0xCAFEDEAD ); r =amdgpu_ring_alloc (ring,3 );if (r) { DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",
@@ -938,7 +938,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)amdgpu_ring_write (ring,0xDEADBEEF );amdgpu_ring_commit (ring);for (i =0 ; i < adev->usec_timeout; i++) { - tmp =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CONTEXT_ID)); + tmp =RREG32_SOC15 (UVD ,0 , mmUVD_CONTEXT_ID);if (tmp ==0xDEADBEEF )break ;DRM_UDELAY (1 );
@@ -1149,7 +1149,7 @@ static bool uvd_v7_0_check_soft_reset(void *handle)if (REG_GET_FIELD (tmp,SRBM_STATUS ,UVD_RQ_PENDING ) ||REG_GET_FIELD (tmp,SRBM_STATUS ,UVD_BUSY ) || - (RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_STATUS) & + (RREG32_SOC15 (UVD ,0 , mmUVD_STATUS) & AMDGPU_UVD_STATUS_BUSY_MASK))) srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_UVD ,1 );
@@ -1256,9 +1256,9 @@ static void uvd_v7_0_set_sw_clock_gating(struct amdgpu_device *adev) {uint32_t data, data1, data2, suvd_flags; - data =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CGC_CTRL)); - data1 =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_GATE)); - data2 =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_CTRL)); + data =RREG32_SOC15 (UVD ,0 , mmUVD_CGC_CTRL); + data1 =RREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_GATE); + data2 =RREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_CTRL); data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK );
@@ -1302,18 +1302,18 @@ static void uvd_v7_0_set_sw_clock_gating(struct amdgpu_device *adev) UVD_SUVD_CGC_CTRL__SDB_MODE_MASK); data1 |= suvd_flags; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CGC_CTRL), data); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CGC_GATE),0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_GATE), data1); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_CTRL), data2); +WREG32_SOC15 (UVD ,0 , mmUVD_CGC_CTRL, data); +WREG32_SOC15 (UVD ,0 , mmUVD_CGC_GATE,0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_GATE, data1); +WREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_CTRL, data2); }static void uvd_v7_0_set_hw_clock_gating (struct amdgpu_device *adev) {uint32_t data, data1, cgc_flags, suvd_flags; - data =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CGC_GATE)); - data1 =RREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_GATE)); + data =RREG32_SOC15 (UVD ,0 , mmUVD_CGC_GATE); + data1 =RREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_GATE); cgc_flags =UVD_CGC_GATE__SYS_MASK | UVD_CGC_GATE__UDEC_MASK |
@@ -1345,8 +1345,8 @@ static void uvd_v7_0_set_hw_clock_gating(struct amdgpu_device *adev) data |= cgc_flags; data1 |= suvd_flags; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_CGC_GATE), data); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SUVD_CGC_GATE), data1); +WREG32_SOC15 (UVD ,0 , mmUVD_CGC_GATE, data); +WREG32_SOC15 (UVD ,0 , mmUVD_SUVD_CGC_GATE, data1); }static void uvd_v7_0_set_bypass_mode (struct amdgpu_device *adev,bool enable)
@@ -1405,7 +1405,7 @@ static int uvd_v7_0_set_powergating_state(void *handle,if (!(adev->pg_flags &AMD_PG_SUPPORT_UVD ))return 0 ; -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_POWER_STATUS),UVD_POWER_STATUS__UVD_PG_EN_MASK ); +WREG32_SOC15 (UVD ,0 , mmUVD_POWER_STATUS,UVD_POWER_STATUS__UVD_PG_EN_MASK );if (state ==AMD_PG_STATE_GATE ) {uvd_v7_0_stop (adev);
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/10 drm/amd/amdgpu: Port GMC v9.0 driver to new SOC15 macros
In reply to a message not in the archiveAs well swap a read/set/write pattern over to WREG32_FIELD15.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -7
@@ -417,7 +417,7 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev)/* hbm memory channel size */ chansize =128 ; - tmp =RREG32 (SOC15_REG_OFFSET (DF ,0 , mmDF_CS_AON0_DramBaseAddress0)); + tmp =RREG32_SOC15 (DF ,0 , mmDF_CS_AON0_DramBaseAddress0); tmp &= DF_CS_AON0_DramBaseAddress0__IntLvNumChan_MASK; tmp >>= DF_CS_AON0_DramBaseAddress0__IntLvNumChan__SHIFT;switch (tmp) {
@@ -706,13 +706,10 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)if (r)return r; - tmp =RREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_MISC_CNTL)); - tmp |=HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE_MASK ; -WREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_MISC_CNTL), tmp); - - tmp =RREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_HOST_PATH_CNTL)); -WREG32 (SOC15_REG_OFFSET (HDP ,0 , mmHDP_HOST_PATH_CNTL), tmp); +WREG32_FIELD15 (HDP ,0 ,HDP_MISC_CNTL ,FLUSH_INVALIDATE_CACHE ,1 ); + tmp =RREG32_SOC15 (HDP ,0 , mmHDP_HOST_PATH_CNTL); +WREG32_SOC15 (HDP ,0 , mmHDP_HOST_PATH_CNTL, tmp);if (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) value = false;
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/10 drm/amd/amdgpu: Port NBIO v6.1 driver over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 44 ++++++++++++++-------------------- 1 file changed, 18 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +18 -26
@@ -35,7 +35,7 @@u32 nbio_v6_1_get_rev_id (struct amdgpu_device *adev) { -u32 tmp =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0)); +u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); tmp &=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK ; tmp >>=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT ;
@@ -46,32 +46,32 @@ u32 nbio_v6_1_get_rev_id(struct amdgpu_device *adev)u32 nbio_v6_1_get_atombios_scratch_regs (struct amdgpu_device *adev,uint32_t idx) { -return RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIOS_SCRATCH_0) + idx); +return RREG32_SOC15_OFFSET (NBIO ,0 , mmBIOS_SCRATCH_0, idx); }void nbio_v6_1_set_atombios_scratch_regs (struct amdgpu_device *adev,uint32_t idx,uint32_t val) { -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIOS_SCRATCH_0) + idx, val); +WREG32_SOC15_OFFSET (NBIO ,0 , mmBIOS_SCRATCH_0, idx, val); }void nbio_v6_1_mc_access_enable (struct amdgpu_device *adev,bool enable) {if (enable) -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_FB_EN), -BIF_FB_EN__FB_READ_EN_MASK |BIF_FB_EN__FB_WRITE_EN_MASK ); +WREG32_SOC15 (NBIO ,0 , mmBIF_FB_EN, +BIF_FB_EN__FB_READ_EN_MASK |BIF_FB_EN__FB_WRITE_EN_MASK );else -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_FB_EN),0 ); +WREG32_SOC15 (NBIO ,0 , mmBIF_FB_EN,0 ); }void nbio_v6_1_hdp_flush (struct amdgpu_device *adev) { -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +WREG32_SOC15 (NBIO ,0 , mmBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL,0 ); }u32 nbio_v6_1_get_memsize (struct amdgpu_device *adev) { -return RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_PF_0_0_RCC_CONFIG_MEMSIZE)); +return RREG32_SOC15 (NBIO ,0 , mmRCC_PF_0_0_RCC_CONFIG_MEMSIZE); } static const u32 nbio_sdma_doorbell_range_reg[] =
@@ -97,15 +97,8 @@ void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instance,void nbio_v6_1_enable_doorbell_aperture (struct amdgpu_device *adev,bool enable) { -u32 tmp; - - tmp =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_PF_0_0_RCC_DOORBELL_APER_EN)); -if (enable) - tmp =REG_SET_FIELD (tmp,RCC_PF_0_0_RCC_DOORBELL_APER_EN ,BIF_DOORBELL_APER_EN ,1 ); -else - tmp =REG_SET_FIELD (tmp,RCC_PF_0_0_RCC_DOORBELL_APER_EN ,BIF_DOORBELL_APER_EN ,0 ); - -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_PF_0_0_RCC_DOORBELL_APER_EN), tmp); +WREG32_FIELD15 (NBIO ,0 ,RCC_PF_0_0_RCC_DOORBELL_APER_EN , +BIF_DOORBELL_APER_EN , enable ?1 :0 ); } void nbio_v6_1_enable_doorbell_selfring_aperture(struct amdgpu_device *adev,
@@ -118,13 +111,13 @@ void nbio_v6_1_enable_doorbell_selfring_aperture(struct amdgpu_device *adev,REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL ,DOORBELL_SELFRING_GPA_APER_MODE ,1 ) |REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL ,DOORBELL_SELFRING_GPA_APER_SIZE ,0 ); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_LOW), +WREG32_SOC15 (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_LOW,lower_32_bits (adev->doorbell.base)); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_HIGH), +WREG32_SOC15 (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_HIGH,upper_32_bits (adev->doorbell.base)); } -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL), tmp); +WREG32_SOC15 (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL, tmp); }
@@ -139,7 +132,7 @@ void nbio_v6_1_ih_doorbell_range(struct amdgpu_device *adev, }else ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,0 ); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE), ih_doorbell_range); +WREG32_SOC15 (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE, ih_doorbell_range); }void nbio_v6_1_ih_control (struct amdgpu_device *adev)
@@ -147,15 +140,15 @@ void nbio_v6_1_ih_control(struct amdgpu_device *adev)u32 interrupt_cntl;/* setup interrupt control */ -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmINTERRUPT_CNTL2), adev->dummy_page.addr >>8 ); - interrupt_cntl =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmINTERRUPT_CNTL)); +WREG32_SOC15 (NBIO ,0 , mmINTERRUPT_CNTL2, adev->dummy_page.addr >>8 ); + interrupt_cntl =RREG32_SOC15 (NBIO ,0 , mmINTERRUPT_CNTL);/* INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=0 - dummy read disabled with msi, enabled without msi * INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=1 - dummy read controlled by IH_DUMMY_RD_EN */ interrupt_cntl =REG_SET_FIELD (interrupt_cntl,INTERRUPT_CNTL ,IH_DUMMY_RD_OVERRIDE ,0 );/* INTERRUPT_CNTL__IH_REQ_NONSNOOP_EN_MASK=1 if ring is in non-cacheable memory, e.g., vram */ interrupt_cntl =REG_SET_FIELD (interrupt_cntl,INTERRUPT_CNTL ,IH_REQ_NONSNOOP_EN ,0 ); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmINTERRUPT_CNTL), interrupt_cntl); +WREG32_SOC15 (NBIO ,0 , mmINTERRUPT_CNTL, interrupt_cntl); } void nbio_v6_1_update_medium_grain_clock_gating(struct amdgpu_device *adev,
@@ -251,8 +244,7 @@ void nbio_v6_1_detect_hw_virt(struct amdgpu_device *adev) {uint32_t reg; - reg =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , - mmRCC_PF_0_0_RCC_IOV_FUNC_IDENTIFIER)); + reg =RREG32_SOC15 (NBIO ,0 , mmRCC_PF_0_0_RCC_IOV_FUNC_IDENTIFIER);if (reg &1 ) adev->virt.caps |=AMDGPU_SRIOV_CAPS_IS_VF ;
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/10 drm/amd/amdgpu: Port PSP v3.1 over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +17 -17
@@ -172,7 +172,7 @@ int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)/* Check sOS sign of life register to confirm sys driver and sOS * are already been loaded. */ - sol_reg =RREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_81)); + sol_reg =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_81);if (sol_reg)return 0 ;
@@ -188,11 +188,11 @@ int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)memcpy (psp->fw_pri_buf, psp->sys_start_addr, psp->sys_bin_size);/* Provide the sys driver to bootrom */ -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_36), - (uint32_t )(psp->fw_pri_mc_addr >>20 )); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_36, + (uint32_t )(psp->fw_pri_mc_addr >>20 )); psp_gfxdrv_command_reg =1 <<16 ; -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_35), - psp_gfxdrv_command_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_35, + psp_gfxdrv_command_reg);/* there might be handshake issue with hardware which needs delay */ mdelay (20 );
@@ -213,7 +213,7 @@ int psp_v3_1_bootloader_load_sos(struct psp_context *psp)/* Check sOS sign of life register to confirm sys driver and sOS * are already been loaded. */ - sol_reg =RREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_81)); + sol_reg =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_81);if (sol_reg)return 0 ;
@@ -229,17 +229,17 @@ int psp_v3_1_bootloader_load_sos(struct psp_context *psp)memcpy (psp->fw_pri_buf, psp->sos_start_addr, psp->sos_bin_size);/* Provide the PSP secure OS to bootrom */ -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_36), - (uint32_t )(psp->fw_pri_mc_addr >>20 )); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_36, + (uint32_t )(psp->fw_pri_mc_addr >>20 )); psp_gfxdrv_command_reg =2 <<16 ; -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_35), - psp_gfxdrv_command_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_35, + psp_gfxdrv_command_reg);/* there might be handshake issue with hardware which needs delay */ mdelay (20 );#if 0 ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_81), -RREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_81)), +RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_81),0 , true);#endif
@@ -299,17 +299,17 @@ int psp_v3_1_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)/* Write low address of the ring to C2PMSG_69 */ psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr); -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_69), psp_ring_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69, psp_ring_reg);/* Write high address of the ring to C2PMSG_70 */ psp_ring_reg =upper_32_bits (ring->ring_mem_mc_addr); -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_70), psp_ring_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, psp_ring_reg);/* Write size of ring to C2PMSG_71 */ psp_ring_reg = ring->ring_size; -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_71), psp_ring_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_71, psp_ring_reg);/* Write the ring initialization command to C2PMSG_64 */ psp_ring_reg = ring_type; psp_ring_reg = psp_ring_reg <<16 ; -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), psp_ring_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg);/* there might be handshake issue with hardware which needs delay */ mdelay (20 );
@@ -334,7 +334,7 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,uint32_t rb_frame_size_dw =sizeof (struct psp_gfx_rb_frame ) /4 ;/* KM (GPCOM) prepare write pointer */ - psp_write_ptr_reg =RREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_67)); + psp_write_ptr_reg =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_67);/* Update KM RB frame pointer to new frame */ /* write_frame ptr increments by size of rb_frame in bytes */
@@ -356,7 +356,7 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,/* Update the write Pointer in DWORDs */ psp_write_ptr_reg = (psp_write_ptr_reg + rb_frame_size_dw) % ring_size_dw; -WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_67), psp_write_ptr_reg); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_67, psp_write_ptr_reg);return 0 ; }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 10.04.2017 um 18:19 schrieb Tom St Denis:
Quoted 3 lines
This series ports a variety of vega10 drivers over to the new SOC15 macros and introduces a pair of OFFSET ready macros to help with MC related code.
Patch #1 is Reviewed-by: Christian König <[email protected]>
Patches #2-#10 are Acked-by: Christian König <[email protected]>
Quoted 5 lines
_______________________________________________
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