Various SOC15 macro cleanups
Subsystems (2)
These replace some of the more verbose patterns with new SOC15 macros. Should be no functional change to anything.
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Christian König
Acked-byRe: [PATCH 01/10] drm/amd/amdgpu: Add offset variant to SOC15 macros
Am 12.06.2017 um 19:54 schrieb Tom St Denis:
Quoted 4 lines
Allows reading/writing via SOC15 macros with offset for various register banks.
Signed-off-by Tom St Denis <[email protected]>
Quoted 26 lines
--- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/amd/amdgpu/soc15_common.h +7
-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)
drivers/gpu/drm/amd/amdgpu/soc15_common.h struct nbio_pcie_index_data { · line 89
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/soc15_common.h +7
-0+#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
_______________________________________________
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 archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +12 -14
@@ -33,7 +33,7 @@u64 gfxhub_v1_0_get_mc_fb_offset (struct amdgpu_device *adev) { -return (u64 )RREG32 (SOC15_REG_OFFSET (GC ,0 , mmMC_VM_FB_OFFSET)) <<24 ; +return (u64 )RREG32_SOC15 (GC ,0 , mmMC_VM_FB_OFFSET) <<24 ; }static void gfxhub_v1_0_init_gart_pt_regs (struct amdgpu_device *adev)
@@ -188,7 +188,7 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev)uint32_t tmp;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);
@@ -209,12 +209,12 @@ static void gfxhub_v1_0_setup_vmid_config(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 , +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_REG_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32) + i*2 , +WREG32_SOC15_OFFSET (GC ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32, i*2 ,upper_32_bits (adev->vm_manager.max_pfn -1 )); } }
@@ -224,12 +224,10 @@ static void gfxhub_v1_0_program_invalidation(struct amdgpu_device *adev)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 ); } }
@@ -268,7 +266,7 @@ 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 (GC ,0 , mmMC_VM_MX_L1_TLB_CNTL);
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 archive--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3 -8
@@ -71,7 +71,6 @@ static void gfxhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev)static void gfxhub_v1_0_init_system_aperture_regs (struct amdgpu_device *adev) {uint64_t value; -uint32_t tmp;/* Disable AGP. */ WREG32_SOC15 (GC ,0 , mmMC_VM_AGP_BASE,0 );
@@ -98,10 +97,8 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)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 (GC ,0 , mmVM_L2_PROTECTION_FAULT_CNTL2, tmp); +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)
@@ -278,9 +275,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 archive--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +11 -14
@@ -200,8 +200,7 @@ static void mmhub_v1_0_setup_vmid_config(struct amdgpu_device *adev)uint32_t tmp;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,
@@ -223,12 +222,12 @@ static void mmhub_v1_0_setup_vmid_config(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 , +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_REG_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32) + i*2 , +WREG32_SOC15_OFFSET (MMHUB ,0 , mmVM_CONTEXT1_PAGE_TABLE_END_ADDR_HI32, i*2 ,upper_32_bits (adev->vm_manager.max_pfn -1 )); } }
@@ -238,12 +237,10 @@ static void mmhub_v1_0_program_invalidation(struct amdgpu_device *adev)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 ); } }
@@ -282,7 +279,7 @@ 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 (MMHUB ,0 , mmMC_VM_MX_L1_TLB_CNTL);
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: Port UVD 7.0 over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 174 +++++++++++++++++----------------- 1 file changed, 87 insertions(+), 87 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +87 -87
@@ -58,7 +58,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); }/**
@@ -73,9 +73,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); }/**
@@ -89,7 +89,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); }/**
@@ -107,9 +107,9 @@ static uint64_t uvd_v7_0_enc_ring_get_wptr(struct amdgpu_ring *ring)return adev->wb.wb[ring->wptr_offs];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); }/**
@@ -123,7 +123,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)); }/**
@@ -145,10 +145,10 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring) }if (ring == &adev->uvd.ring_enc[0 ]) -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR), +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR,lower_32_bits (ring->wptr));else -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR2), +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); }
@@ -617,46 +617,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), +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_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +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), +WREG32_SOC15 (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), +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), +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET0,AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0), size); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0, size); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW), +WREG32_SOC15 (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), +WREG32_SOC15 (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 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET1, (1 <<21 )); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE1,AMDGPU_UVD_HEAP_SIZE ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW), +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_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH), +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_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET2), (2 <<21 )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE2), +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_REG_OFFSET (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG), +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG, adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG), +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG, adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DBW_ADDR_CONFIG), +WREG32_SOC15 (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_GP_SCRATCH4, adev->uvd.max_handles); } static int uvd_v7_0_mmsch_start(struct amdgpu_device *adev,
@@ -670,29 +670,29 @@ static int uvd_v7_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 ;
@@ -935,7 +935,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 |
@@ -947,7 +947,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 |
@@ -960,23 +960,23 @@ 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), +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), +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CNTL,UVD_VCPU_CNTL__CLK_EN_MASK );/* enable UMC */
@@ -984,14 +984,14 @@ static int uvd_v7_0_start(struct amdgpu_device *adev) ~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 );
@@ -1032,44 +1032,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), +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), +WREG32_SOC15 (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), +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), + 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 ; }
@@ -1084,7 +1084,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),
@@ -1093,12 +1093,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), +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,
@@ -1203,7 +1203,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",
@@ -1215,7 +1215,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 );
@@ -1413,8 +1413,8 @@ 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) & -AMDGPU_UVD_STATUS_BUSY_MASK ))) + (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 );
@@ -1521,9 +1521,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 );
@@ -1567,18 +1567,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 |
@@ -1610,8 +1610,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)
@@ -1670,7 +1670,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 6/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 | 54 +++++++++++++++------------------- 1 file changed, 23 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +23 -31
@@ -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,33 @@ 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 +98,7 @@ 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,
@@ -115,23 +108,23 @@ void nbio_v6_1_enable_doorbell_selfring_aperture(struct amdgpu_device *adev,if (enable) { tmp =REG_SET_FIELD (tmp,BIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_CNTL ,DOORBELL_SELFRING_GPA_APER_EN ,1 ) | -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 ); +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), -lower_32_bits (adev->doorbell.base)); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_HIGH), -upper_32_bits (adev->doorbell.base)); +WREG32_SOC15 (NBIO ,0 , mmBIF_BX_PF0_DOORBELL_SELFRING_GPA_APER_BASE_LOW, +lower_32_bits (adev->doorbell.base)); +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); }void nbio_v6_1_ih_doorbell_range (struct amdgpu_device *adev,bool use_doorbell,int doorbell_index) { -u32 ih_doorbell_range =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE)); +u32 ih_doorbell_range =RREG32_SOC15 (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE);if (use_doorbell) { ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,OFFSET , doorbell_index);
@@ -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 7/10 drm/amd/amdgpu: Port NBIO v7.0 driver over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 42 ++++++++++++++-------------------- 1 file changed, 17 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +17 -25
@@ -34,7 +34,7 @@u32 nbio_v7_0_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 ;
@@ -45,32 +45,32 @@ u32 nbio_v7_0_get_rev_id(struct amdgpu_device *adev)u32 nbio_v7_0_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_v7_0_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_v7_0_mc_access_enable (struct amdgpu_device *adev,bool enable) {if (enable) -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_FB_EN), +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_v7_0_hdp_flush (struct amdgpu_device *adev) { -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL),0 ); +WREG32_SOC15 (NBIO ,0 , mmHDP_MEM_COHERENCY_FLUSH_CNTL,0 ); }u32 nbio_v7_0_get_memsize (struct amdgpu_device *adev) { -return RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_CONFIG_MEMSIZE)); +return RREG32_SOC15 (NBIO ,0 , mmRCC_CONFIG_MEMSIZE); } static const u32 nbio_sdma_doorbell_range_reg[] =
@@ -96,21 +96,13 @@ void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instance,void nbio_v7_0_enable_doorbell_aperture (struct amdgpu_device *adev,bool enable) { -u32 tmp; - - tmp =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_DOORBELL_APER_EN)); -if (enable) - tmp =REG_SET_FIELD (tmp,RCC_DOORBELL_APER_EN ,BIF_DOORBELL_APER_EN ,1 ); -else - tmp =REG_SET_FIELD (tmp,RCC_DOORBELL_APER_EN ,BIF_DOORBELL_APER_EN ,0 ); - -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmRCC_DOORBELL_APER_EN), tmp); +WREG32_FIELD15 (NBIO ,0 ,RCC_DOORBELL_APER_EN ,BIF_DOORBELL_APER_EN , enable ?1 :0 ); }void nbio_v7_0_ih_doorbell_range (struct amdgpu_device *adev,bool use_doorbell,int doorbell_index) { -u32 ih_doorbell_range =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE)); +u32 ih_doorbell_range =RREG32_SOC15 (NBIO ,0 , mmBIF_IH_DOORBELL_RANGE);if (use_doorbell) { ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,OFFSET , doorbell_index);
@@ -118,15 +110,15 @@ void nbio_v7_0_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); }static uint32_t nbio_7_0_read_syshub_ind_mmr (struct amdgpu_device *adev,uint32_t offset) {uint32_t data; -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmSYSHUB_INDEX), offset); - data =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmSYSHUB_DATA)); +WREG32_SOC15 (NBIO ,0 , mmSYSHUB_INDEX, offset); + data =RREG32_SOC15 (NBIO ,0 , mmSYSHUB_DATA);return data; }
@@ -134,8 +126,8 @@ static uint32_t nbio_7_0_read_syshub_ind_mmr(struct amdgpu_device *adev, uint32_static void nbio_7_0_write_syshub_ind_mmr (struct amdgpu_device *adev,uint32_t offset,uint32_t data) { -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmSYSHUB_INDEX), offset); -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmSYSHUB_DATA), data); +WREG32_SOC15 (NBIO ,0 , mmSYSHUB_INDEX, offset); +WREG32_SOC15 (NBIO ,0 , mmSYSHUB_DATA, data); } void nbio_v7_0_update_medium_grain_clock_gating(struct amdgpu_device *adev,
@@ -182,15 +174,15 @@ void nbio_v7_0_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); }struct nbio_hdp_flush_reg nbio_v7_0_hdp_flush_reg;
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 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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +16 -16
@@ -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,10 +188,10 @@ 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), +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), +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_35, psp_gfxdrv_command_reg);/* there might be handshake issue with hardware which needs delay */
@@ -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), +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), +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 );
@@ -332,7 +332,7 @@ int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)/* Write the ring destroy command to C2PMSG_64 */ psp_ring_reg =3 <<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 );
@@ -361,7 +361,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 */
@@ -383,7 +383,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 ; }
@@ -515,7 +515,7 @@ bool psp_v3_1_smu_reload_quirk(struct psp_context *psp)uint32_t reg; reg = smnMP1_FIRMWARE_FLAGS |0x03b00000 ; -WREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmPCIE_INDEX2), reg); - reg =RREG32 (SOC15_REG_OFFSET (NBIO ,0 , mmPCIE_DATA2)); +WREG32_SOC15 (NBIO ,0 , mmPCIE_INDEX2, reg); + reg =RREG32_SOC15 (NBIO ,0 , mmPCIE_DATA2);return (reg &MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK ) ? true : 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 PSP v10.0 over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +7 -7
@@ -133,21 +133,21 @@ int psp_v10_0_ring_init(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);/* Wait for response flag (bit 31) in C2PMSG_64 */ psp_ring_reg =0 ;while ((psp_ring_reg &0x80000000 ) ==0 ) { - psp_ring_reg =RREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64)); + psp_ring_reg =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64); }return 0 ;
@@ -164,7 +164,7 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,struct amdgpu_device *adev = psp->adev;/* 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 */ if ((psp_write_ptr_reg % ring->ring_size) ==0 )
@@ -182,7 +182,7 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,/* Update the write Pointer in DWORDs */ psp_write_ptr_reg +=sizeof (struct psp_gfx_rb_frame ) /4 ; psp_write_ptr_reg = (psp_write_ptr_reg >= ring->ring_size) ?0 : psp_write_ptr_reg; -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
PATCH 10/10 drm/amd/amdgpu: Port VCN over to new SOC15 macros
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 164 +++++++++++++++++----------------- 1 file changed, 82 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +82 -82
@@ -249,34 +249,34 @@ static void vcn_v1_0_mc_resume(struct amdgpu_device *adev) {uint32_t size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size +4 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW,lower_32_bits (adev->vcn.gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,upper_32_bits (adev->vcn.gpu_addr)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET0), +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET0,AMDGPU_UVD_FIRMWARE_OFFSET >>3 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0), size); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE0, size); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW,lower_32_bits (adev->vcn.gpu_addr + size)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH,upper_32_bits (adev->vcn.gpu_addr + size)); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET1),0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE1),AMDGPU_VCN_HEAP_SIZE ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET1,0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE1,AMDGPU_VCN_HEAP_SIZE ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW,lower_32_bits (adev->vcn.gpu_addr + size +AMDGPU_VCN_HEAP_SIZE )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH), +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH,upper_32_bits (adev->vcn.gpu_addr + size +AMDGPU_VCN_HEAP_SIZE )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET2),0 ); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_VCPU_CACHE_SIZE2), +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_OFFSET2,0 ); +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CACHE_SIZE2,AMDGPU_VCN_STACK_SIZE + (AMDGPU_VCN_SESSION_SIZE *40 )); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG), +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_ADDR_CONFIG, adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG), +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_DB_ADDR_CONFIG, adev->gfx.config.gb_addr_config); -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_UDEC_DBW_ADDR_CONFIG), +WREG32_SOC15 (UVD ,0 , mmUVD_UDEC_DBW_ADDR_CONFIG, adev->gfx.config.gb_addr_config); }
@@ -293,7 +293,7 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw)uint32_t data;/* JPEG disable CGC */ - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmJPEG_CGC_CTRL);if (sw) data |=1 <<JPEG_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ;
@@ -302,14 +302,14 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) data |=1 <<JPEG_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; data |=4 <<JPEG_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmJPEG_CGC_CTRL, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_GATE)); + data =RREG32_SOC15 (VCN ,0 , mmJPEG_CGC_GATE); data &= ~(JPEG_CGC_GATE__JPEG_MASK |JPEG_CGC_GATE__JPEG2_MASK ); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_GATE), data); +WREG32_SOC15 (VCN ,0 , mmJPEG_CGC_GATE, data);/* UVD disable CGC */ - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL);if (sw) data |=1 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ;else
@@ -317,9 +317,9 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) data |=1 <<UVD_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; data |=4 <<UVD_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_GATE)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_CGC_GATE); data &= ~(UVD_CGC_GATE__SYS_MASK |UVD_CGC_GATE__UDEC_MASK | UVD_CGC_GATE__MPEG2_MASK
@@ -340,9 +340,9 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_CGC_GATE__WCB_MASK |UVD_CGC_GATE__VCPU_MASK | UVD_CGC_GATE__SCPU_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_GATE), data); +WREG32_SOC15 (VCN ,0 , mmUVD_CGC_GATE, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL); data &= ~(UVD_CGC_CTRL__UDEC_RE_MODE_MASK |UVD_CGC_CTRL__UDEC_CM_MODE_MASK | UVD_CGC_CTRL__UDEC_IT_MODE_MASK
@@ -363,10 +363,10 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_CGC_CTRL__WCB_MODE_MASK |UVD_CGC_CTRL__VCPU_MODE_MASK | UVD_CGC_CTRL__SCPU_MODE_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL, data);/* turn on */ - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_GATE)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_GATE); data |= (UVD_SUVD_CGC_GATE__SRE_MASK |UVD_SUVD_CGC_GATE__SIT_MASK | UVD_SUVD_CGC_GATE__SMP_MASK
@@ -391,9 +391,9 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_SUVD_CGC_GATE__SIT_VP9_DEC_MASK |UVD_SUVD_CGC_GATE__SDB_VP9_MASK | UVD_SUVD_CGC_GATE__IME_HEVC_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_GATE), data); +WREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_GATE, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_CTRL); data &= ~(UVD_SUVD_CGC_CTRL__SRE_MODE_MASK |UVD_SUVD_CGC_CTRL__SIT_MODE_MASK | UVD_SUVD_CGC_CTRL__SMP_MODE_MASK
@@ -404,7 +404,7 @@ static void vcn_v1_0_disable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_SUVD_CGC_CTRL__ENT_MODE_MASK |UVD_SUVD_CGC_CTRL__IME_MODE_MASK | UVD_SUVD_CGC_CTRL__SITE_MODE_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_CTRL, data); }/**
@@ -420,30 +420,30 @@ static void vcn_v1_0_enable_clock_gating(struct amdgpu_device *adev, bool sw)uint32_t data =0 ;/* enable JPEG CGC */ - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmJPEG_CGC_CTRL);if (sw) data |=1 <<JPEG_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ;else data |=0 <<JPEG_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; data |=1 <<JPEG_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; data |=4 <<JPEG_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmJPEG_CGC_CTRL, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_GATE)); + data =RREG32_SOC15 (VCN ,0 , mmJPEG_CGC_GATE); data |= (JPEG_CGC_GATE__JPEG_MASK |JPEG_CGC_GATE__JPEG2_MASK ); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmJPEG_CGC_GATE), data); +WREG32_SOC15 (VCN ,0 , mmJPEG_CGC_GATE, data);/* enable UVD CGC */ - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL);if (sw) data |=1 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ;else data |=0 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; data |=1 <<UVD_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; data |=4 <<UVD_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL); data |= (UVD_CGC_CTRL__UDEC_RE_MODE_MASK |UVD_CGC_CTRL__UDEC_CM_MODE_MASK | UVD_CGC_CTRL__UDEC_IT_MODE_MASK
@@ -464,9 +464,9 @@ static void vcn_v1_0_enable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_CGC_CTRL__WCB_MODE_MASK |UVD_CGC_CTRL__VCPU_MODE_MASK | UVD_CGC_CTRL__SCPU_MODE_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_CGC_CTRL, data); - data =RREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_CTRL)); + data =RREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_CTRL); data |= (UVD_SUVD_CGC_CTRL__SRE_MODE_MASK |UVD_SUVD_CGC_CTRL__SIT_MODE_MASK | UVD_SUVD_CGC_CTRL__SMP_MODE_MASK
@@ -477,7 +477,7 @@ static void vcn_v1_0_enable_clock_gating(struct amdgpu_device *adev, bool sw) | UVD_SUVD_CGC_CTRL__ENT_MODE_MASK |UVD_SUVD_CGC_CTRL__IME_MODE_MASK | UVD_SUVD_CGC_CTRL__SITE_MODE_MASK); -WREG32 (SOC15_REG_OFFSET (VCN ,0 , mmUVD_SUVD_CGC_CTRL), data); +WREG32_SOC15 (VCN ,0 , mmUVD_SUVD_CGC_CTRL, data); }/**
@@ -513,7 +513,7 @@ static int vcn_v1_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 |
@@ -525,7 +525,7 @@ static int vcn_v1_0_start(struct amdgpu_device *adev)mdelay (5 );/* initialize VCN 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 |
@@ -537,22 +537,22 @@ static int vcn_v1_0_start(struct amdgpu_device *adev)/* swap (8 in 32) RB and IB */ lmi_swap_cntl =0xa ;#endif -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_LMI_SWAP_CNTL), lmi_swap_cntl); +WREG32_SOC15 (UVD ,0 , mmUVD_LMI_SWAP_CNTL, lmi_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), +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), +WREG32_SOC15 (UVD ,0 , mmUVD_VCPU_CNTL,UVD_VCPU_CNTL__CLK_EN_MASK );/* enable UMC */
@@ -560,14 +560,14 @@ static int vcn_v1_0_start(struct amdgpu_device *adev) ~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 );
@@ -608,44 +608,44 @@ static int vcn_v1_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), +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), +WREG32_SOC15 (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), +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), + 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->vcn.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->vcn.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 ; }
@@ -660,7 +660,7 @@ static int vcn_v1_0_start(struct amdgpu_device *adev)static int vcn_v1_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),
@@ -669,12 +669,12 @@ static int vcn_v1_0_stop(struct amdgpu_device *adev)mdelay (1 );/* put VCPU into reset */ -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_SOFT_RESET), +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,
@@ -704,7 +704,7 @@ static uint64_t vcn_v1_0_dec_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); }/**
@@ -718,7 +718,7 @@ static uint64_t vcn_v1_0_dec_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); }/**
@@ -732,7 +732,7 @@ static void vcn_v1_0_dec_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)); }/**
@@ -922,9 +922,9 @@ static uint64_t vcn_v1_0_enc_ring_get_rptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vcn.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); }/**
@@ -939,9 +939,9 @@ static uint64_t vcn_v1_0_enc_ring_get_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vcn.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); }/**
@@ -956,10 +956,10 @@ static void vcn_v1_0_enc_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vcn.ring_enc[0 ]) -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR), +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR,lower_32_bits (ring->wptr));else -WREG32 (SOC15_REG_OFFSET (UVD ,0 , mmUVD_RB_WPTR2), +WREG32_SOC15 (UVD ,0 , mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 2 lines · Tom St Denis
These replace some of the more verbose patterns with new SOC15 macros. Should be no functional change to anything.
Series is:
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