support ArcturusIFM workaround
Subsystems (2)
cover support ArcturusIFM workaround
Add vcn2.5 dpg mode/dpg pause mode/dpg sram mode to support acturus IFM(instruction fetch monitor) work around.
James Zhu (6):
drm/amdgpu/vcn: support multiple-instance dpg pause mode drm/amdgpu/vcn2.5: add direct SRAM read and write drm/amdgpu/vcn2.5: add DPG mode start and stop drm/amdgpu/vcn2.5: add dpg pause mode drm/amdgpu/vcn: support multiple-instance dpg sram mode drm/amdgpu/vcn2.5: implement indirect DPG SRAM mode
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 34 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 37 ++- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 394 +++++++++++++++++++++++++++++++- 5 files changed, 450 insertions(+), 35 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/6 drm/amdgpu/vcn: support multiple-instance dpg pause mode
Add multiple-instance dpg pause mode support for VCN2.5
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2 -2
@@ -298,7 +298,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)else new_state.fw_based =VCN_DPG_STATE__UNPAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev, j, &new_state); } fence[j] +=amdgpu_fence_count_emitted (&adev->vcn.inst[j].ring_dec);
@@ -341,7 +341,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)if (ring->funcs->type ==AMDGPU_RING_TYPE_VCN_ENC ) new_state.fw_based =VCN_DPG_STATE__PAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev, ring->me, &new_state); } }
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +1 -1
@@ -199,7 +199,7 @@ struct amdgpu_vcn {unsigned harvest_config;int (*pause_dpg_mode)(struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state); };int amdgpu_vcn_sw_init (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +4 -4
@@ -50,7 +50,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);static void vcn_v1_0_set_irq_funcs (struct amdgpu_device *adev);static int vcn_v1_0_set_powergating_state (void *handle,enum amd_powergating_state state);static int vcn_v1_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state);static void vcn_v1_0_idle_work_handler (struct work_struct *work);
@@ -1199,7 +1199,7 @@ static int vcn_v1_0_stop(struct amdgpu_device *adev) }static int vcn_v1_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state) +int inst_idx,struct dpg_pause_state *new_state) {int ret_code;uint32_t reg_data =0 ;
@@ -1786,7 +1786,7 @@ static void vcn_v1_0_idle_work_handler(struct work_struct *work)else new_state.jpeg =VCN_DPG_STATE__UNPAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev,0 , &new_state); } fences +=amdgpu_fence_count_emitted (&adev->jpeg.inst->ring_dec);
@@ -1840,7 +1840,7 @@ void vcn_v1_0_ring_begin_use(struct amdgpu_ring *ring)else if (ring->funcs->type ==AMDGPU_RING_TYPE_VCN_JPEG ) new_state.jpeg =VCN_DPG_STATE__PAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev,0 , &new_state); } }
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +2 -2
@@ -58,7 +58,7 @@ static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev);static int vcn_v2_0_set_powergating_state (void *handle,enum amd_powergating_state state);static int vcn_v2_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state);/** * vcn_v2_0_early_init - set function pointers
@@ -1135,7 +1135,7 @@ static int vcn_v2_0_stop(struct amdgpu_device *adev) }static int vcn_v2_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state) +int inst_idx,struct dpg_pause_state *new_state) {struct amdgpu_ring *ring;uint32_t reg_data =0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 1/6] drm/amdgpu/vcn: support multiple-instance dpg pause mode
Quoted 99 lines · James Zhu
Add multiple-instance dpg pause mode support for VCN2.5
Signed-off-by James Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2
-2@@ -298,7 +298,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)else new_state.fw_based =VCN_DPG_STATE__UNPAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev, j, &new_state); } fence[j] +=amdgpu_fence_count_emitted (&adev->vcn.inst[j].ring_dec);@@ -341,7 +341,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)if (ring->funcs->type ==AMDGPU_RING_TYPE_VCN_ENC ) new_state.fw_based =VCN_DPG_STATE__PAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev, ring->me, &new_state); } }drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +1
-1@@ -199,7 +199,7 @@ struct amdgpu_vcn {unsigned harvest_config;int (*pause_dpg_mode)(struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state); };int amdgpu_vcn_sw_init (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +4
-4@@ -50,7 +50,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);static void vcn_v1_0_set_irq_funcs (struct amdgpu_device *adev);static int vcn_v1_0_set_powergating_state (void *handle,enum amd_powergating_state state);static int vcn_v1_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state);static void vcn_v1_0_idle_work_handler (struct work_struct *work);@@ -1199,7 +1199,7 @@ static int vcn_v1_0_stop(struct amdgpu_device *adev) }static int vcn_v1_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state) +int inst_idx,struct dpg_pause_state *new_state) {int ret_code;uint32_t reg_data =0 ;@@ -1786,7 +1786,7 @@ static void vcn_v1_0_idle_work_handler(struct work_struct *work)else new_state.jpeg =VCN_DPG_STATE__UNPAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev,0 , &new_state); } fences +=amdgpu_fence_count_emitted (&adev->jpeg.inst->ring_dec);@@ -1840,7 +1840,7 @@ void vcn_v1_0_ring_begin_use(struct amdgpu_ring *ring)else if (ring->funcs->type ==AMDGPU_RING_TYPE_VCN_JPEG ) new_state.jpeg =VCN_DPG_STATE__PAUSE ; - adev->vcn.pause_dpg_mode (adev, &new_state); + adev->vcn.pause_dpg_mode (adev,0 , &new_state); } }drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-1@@ -58,7 +58,7 @@ static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev);static int vcn_v2_0_set_powergating_state (void *handle,enum amd_powergating_state state);static int vcn_v2_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state); +int inst_idx,struct dpg_pause_state *new_state);/** * vcn_v2_0_early_init - set function pointers
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c static int vcn_v2_0_stop(struct amdgpu_device *adev) · line 1141
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-1@@ -1135,7 +1135,7 @@ static int vcn_v2_0_stop(struct amdgpu_device *adev) }static int vcn_v2_0_pause_dpg_mode (struct amdgpu_device *adev, -struct dpg_pause_state *new_state) +int inst_idx,struct dpg_pause_state *new_state) {struct amdgpu_ring *ring;uint32_t reg_data =0 ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amdgpu/vcn2.5: add direct SRAM read and write
In reply to James ZhuAdd direct SRAM read and write MACRO for vcn2.5
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +18 -0
@@ -127,6 +127,24 @@ } \ } while (0) +#define RREG32_SOC15_DPG_MODE_2_5 (inst_idx, offset, mask_en) \ + ({ \ + WREG32_SOC15(VCN, inst, mmUVD_DPG_LMA_CTL, \ + (0x0 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ + RREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA); \ + }) + +#define WREG32_SOC15_DPG_MODE_2_5 (inst_idx, offset, value, mask_en, indirect) \ + do { \ + WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA, value); \ + WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_CTL, \ + (0x1 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ + } while (0) +enum engine_status_constants {UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON =0x2AAAA0 ,UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON_2_0 =0xAAAA0 ,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/6] drm/amdgpu/vcn2.5: add direct SRAM read and write
I think you can avoid the duplication, instead adding instance to "RREG32(WREG)_SOC15_DPG_MODE_2_0(offset, mask_en) ", just like adding instance to other part of the code.
Regards,
Leo
Quoted 26 lines · James Zhu
Add direct SRAM read and write MACRO for vcn2.5
Signed-off-by James Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +11
-0@@ -127,6 +127,24 @@ } \ } while (0) +#define RREG32_SOC15_DPG_MODE_2_5 (inst_idx, offset, mask_en) \ + ({ \ + WREG32_SOC15(VCN, inst, mmUVD_DPG_LMA_CTL, \ + (0x0 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ + RREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA); \ + }) + +#define WREG32_SOC15_DPG_MODE_2_5 (inst_idx, offset, value, mask_en, indirect) \ + do { \
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h line 150
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +7
-0+WREG32_SOC15 (VCN , inst_idx, mmUVD_DPG_LMA_DATA, value); \ +WREG32_SOC15 (VCN , inst_idx, mmUVD_DPG_LMA_CTL, \ + (0x1 <<UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en <<UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset <<UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT )); \ + }while (0 ) + enum engine_status_constants {UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON =0x2AAAA0 , UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON_2_0 = 0xAAAA0,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/6] drm/amdgpu/vcn2.5: add direct SRAM read and write
Sure. Thanks!
James
Quoted 44 lines · Leo Liu
I think you can avoid the duplication, instead adding instance to "RREG32(WREG)_SOC15_DPG_MODE_2_0(offset,
mask_en) ", just like adding instance to other part of the code.Regards,
Leo
Quoted 36 lines · James Zhu
Add direct SRAM read and write MACRO for vcn2.5
Signed-off-by James Zhu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h| 18 ++++++++++++++++++1 file changed, 18 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +5
-0@@ -127,6 +127,24 @@ } \ } while (0) +#define RREG32_SOC15_DPG_MODE_2_5(inst_idx, offset, mask_en) \ + ({ \ + WREG32_SOC15(VCN, inst, mmUVD_DPG_LMA_CTL, \ + (0x0 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset <<UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \
+RREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA); \
+ })drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +2
-0+ +#define WREG32_SOC15_DPG_MODE_2_5(inst_idx, offset, value, mask_en,indirect) \
+ do { \
+WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA, value); \
+ WREG32_SOC15(VCN,inst_idx,
mmUVD_DPG_LMA_CTL, \
+ (0x1<<UVD_DPG_LMA_CTL__READ_WRITE__SHIFT| \
Quoted 8 lines
Quoted 8 lines
+
mask_en<<UVD_DPG_LMA_CTL__MASK_EN__SHIFT| \
+ offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \
+ } while (0)
+
enumengine_status_constants{UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON=0x2AAAA0,UVD_PGFSM_STATUS__UVDM_UVDU_PWR_ON_2_0=0xAAAA0,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu/vcn2.5: add DPG mode start and stop
In reply to James ZhuAdd DPG mode start and stop functions for vcn2.5
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 295 +++++++++++++++++++++++++++++++++- 1 file changed, 293 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +293 -2
@@ -48,6 +48,11 @@#define mmUVD_LMI_RBC_IB_64BIT_BAR_HIGH_INTERNAL_OFFSET 0x3b5#define mmUVD_RBC_IB_SIZE_INTERNAL_OFFSET 0x25c +#define mmUVD_RBC_XX_IB_REG_CHECK 0x026b +#define mmUVD_RBC_XX_IB_REG_CHECK_BASE_IDX 1 +#define mmUVD_REG_XX_MASK 0x026c +#define mmUVD_REG_XX_MASK_BASE_IDX 1 +#define VCN25_MAX_HW_INSTANCES_ARCTURUS 2static void vcn_v2_5_set_dec_ring_funcs (struct amdgpu_device *adev);
@@ -286,7 +291,8 @@ static int vcn_v2_5_hw_init(void *handle) done:if (!r) -DRM_INFO ("VCN decode and encode initialized successfully.\n" ); +DRM_INFO ("VCN decode and encode initialized successfully(under %s).\n" , + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )?"DPG Mode" :"SPG Mode" );return r; }
@@ -309,7 +315,9 @@ static int vcn_v2_5_hw_fini(void *handle)continue ; ring = &adev->vcn.inst[i].ring_dec; -if (RREG32_SOC15 (VCN , i, mmUVD_STATUS)) +if ((adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) || + (adev->vcn.cur_state !=AMD_PG_STATE_GATE && +RREG32_SOC15 (VCN , i, mmUVD_STATUS)))vcn_v2_5_set_powergating_state (adev,AMD_PG_STATE_GATE ); ring->sched.ready = false;
@@ -418,6 +426,78 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev) } } +static void vcn_v2_5_mc_resume_dpg_mode (struct amdgpu_device *adev,int inst_idx,bool indirect) +{ +uint32_t size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size +4 ); +uint32_t offset; + +/* cache window 0: fw */ +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_lo),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN ].tmr_mc_addr_hi),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET0),0 ,0 , indirect); + offset =0 ; + }else { +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr),0 , indirect); + offset = size; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET0), +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ,0 , indirect); + } + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE0), size,0 , indirect); + +/* cache window 1: stack */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET1),0 ,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE1),AMDGPU_VCN_STACK_SIZE ,0 , indirect); + +/* cache window 2: context */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset +AMDGPU_VCN_STACK_SIZE ),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset +AMDGPU_VCN_STACK_SIZE ),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET2),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE2),AMDGPU_VCN_CONTEXT_SIZE ,0 , indirect); + +/* non-cache window */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_NC0_64BIT_BAR_LOW),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_NC0_64BIT_BAR_HIGH),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_NONCACHE_OFFSET0),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_NONCACHE_SIZE0),0 ,0 , indirect); + +/* VCN global tiling registers */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_GFX8_ADDR_CONFIG), adev->gfx.config.gb_addr_config,0 , indirect); +} +/** * vcn_v2_5_disable_clock_gating - disable VCN clock gating *
@@ -536,6 +616,54 @@ static void vcn_v2_5_disable_clock_gating(struct amdgpu_device *adev) } } +static void vcn_v2_5_clock_gating_dpg_mode (struct amdgpu_device *adev, +uint8_t sram_sel,int inst_idx,uint8_t indirect) +{ +uint32_t reg_data =0 ; + +/* enable sw clock gating control */ +if (adev->cg_flags &AMD_CG_SUPPORT_VCN_MGCG ) + reg_data =1 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; +else + reg_data =0 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; + reg_data |=1 <<UVD_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; + reg_data |=4 <<UVD_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; + reg_data &= ~(UVD_CGC_CTRL__UDEC_RE_MODE_MASK | +UVD_CGC_CTRL__UDEC_CM_MODE_MASK | +UVD_CGC_CTRL__UDEC_IT_MODE_MASK | +UVD_CGC_CTRL__UDEC_DB_MODE_MASK | +UVD_CGC_CTRL__UDEC_MP_MODE_MASK | +UVD_CGC_CTRL__SYS_MODE_MASK | +UVD_CGC_CTRL__UDEC_MODE_MASK | +UVD_CGC_CTRL__MPEG2_MODE_MASK | +UVD_CGC_CTRL__REGS_MODE_MASK | +UVD_CGC_CTRL__RBC_MODE_MASK | +UVD_CGC_CTRL__LMI_MC_MODE_MASK | +UVD_CGC_CTRL__LMI_UMC_MODE_MASK | +UVD_CGC_CTRL__IDCT_MODE_MASK | +UVD_CGC_CTRL__MPRD_MODE_MASK | +UVD_CGC_CTRL__MPC_MODE_MASK | +UVD_CGC_CTRL__LBSI_MODE_MASK | +UVD_CGC_CTRL__LRBBM_MODE_MASK | +UVD_CGC_CTRL__WCB_MODE_MASK | +UVD_CGC_CTRL__VCPU_MODE_MASK | +UVD_CGC_CTRL__MMSCH_MODE_MASK ); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_CGC_CTRL), reg_data, sram_sel, indirect); + +/* turn off clock gating */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_CGC_GATE),0 , sram_sel, indirect); + +/* turn on SUVD clock gating */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_SUVD_CGC_GATE),1 , sram_sel, indirect); + +/* turn on sw mode in UVD_SUVD_CGC_CTRL */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_SUVD_CGC_CTRL),0 , sram_sel, indirect); +} +/** * vcn_v2_5_enable_clock_gating - enable VCN clock gating *
@@ -598,6 +726,130 @@ static void vcn_v2_5_enable_clock_gating(struct amdgpu_device *adev) } } +static int vcn_v2_5_start_dpg_mode (struct amdgpu_device *adev,int inst_idx,bool indirect) +{ +struct amdgpu_ring *ring; +uint32_t rb_bufsz, tmp; + +/* disable register anti-hang mechanism */ +WREG32_P (SOC15_REG_OFFSET (UVD , inst_idx, mmUVD_POWER_STATUS),1 , + ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK ); +/* enable dynamic power gating mode */ + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_POWER_STATUS); + tmp |=UVD_POWER_STATUS__UVD_PG_MODE_MASK ; + tmp |=UVD_POWER_STATUS__UVD_PG_EN_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_POWER_STATUS, tmp); + +/* enable clock gating */ +vcn_v2_5_clock_gating_dpg_mode (adev,0 , inst_idx, indirect); + +/* enable VCPU clock */ + tmp = (0xFF <<UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT ); + tmp |=UVD_VCPU_CNTL__CLK_EN_MASK ; + tmp |=UVD_VCPU_CNTL__BLK_RST_MASK ; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CNTL), tmp,0 , indirect); + +/* disable master interupt */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MASTINT_EN),0 ,0 , indirect); + +/* setup mmUVD_LMI_CTRL */ + tmp = (0x8 |UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | +UVD_LMI_CTRL__REQ_MODE_MASK | +UVD_LMI_CTRL__CRC_RESET_MASK | +UVD_LMI_CTRL__MASK_MC_URGENT_MASK | +UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | +UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK | + (8 <<UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT ) | +0x00100000L ); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_CTRL), tmp,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_CNTL), +0x2 <<UVD_MPC_CNTL__REPLACEMENT_MODE__SHIFT ,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUXA0), + ((0x1 <<UVD_MPC_SET_MUXA0__VARA_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXA0__VARA_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXA0__VARA_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXA0__VARA_4__SHIFT )),0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUXB0), + ((0x1 <<UVD_MPC_SET_MUXB0__VARB_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXB0__VARB_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXB0__VARB_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXB0__VARB_4__SHIFT )),0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUX), + ((0x0 <<UVD_MPC_SET_MUX__SET_0__SHIFT ) | + (0x1 <<UVD_MPC_SET_MUX__SET_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUX__SET_2__SHIFT )),0 , indirect); + +vcn_v2_5_mc_resume_dpg_mode (adev, inst_idx, indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_REG_XX_MASK),0x10 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_RBC_XX_IB_REG_CHECK),0x3 ,0 , indirect); + +/* enable LMI MC and UMC channels */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_CTRL2),0 ,0 , indirect); + +/* unblock VCPU register access */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_RB_ARB_CTRL),0 ,0 , indirect); + + tmp = (0xFF <<UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT ); + tmp |=UVD_VCPU_CNTL__CLK_EN_MASK ; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CNTL), tmp,0 , indirect); + +/* enable master interrupt */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MASTINT_EN), +UVD_MASTINT_EN__VCPU_EN_MASK ,0 , indirect); + + ring = &adev->vcn.inst[inst_idx].ring_dec; +/* force RBC into idle state */ + rb_bufsz =order_base_2 (ring->ring_size); + tmp =REG_SET_FIELD (0 ,UVD_RBC_RB_CNTL ,RB_BUFSZ , rb_bufsz); + tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_BLKSZ ,1 ); + tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_NO_FETCH ,1 ); + 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 (UVD , inst_idx, mmUVD_RBC_RB_CNTL, tmp); + +/* set the write pointer delay */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR_CNTL,0 ); + +/* set the wb address */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR_ADDR, + (upper_32_bits (ring->gpu_addr) >>2 )); + +/* programm the RB_BASE for ring buffer */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_LMI_RBC_RB_64BIT_BAR_LOW, +lower_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH, +upper_32_bits (ring->gpu_addr)); + +/* Initialize the ring buffer's read and write pointers */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR,0 ); + +WREG32_SOC15 (UVD , inst_idx, mmUVD_SCRATCH2,0 ); + + ring->wptr =RREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR, +lower_32_bits (ring->wptr)); + +return 0 ; +} +static int vcn_v2_5_start (struct amdgpu_device *adev) {struct amdgpu_ring *ring;
@@ -610,6 +862,9 @@ static int vcn_v2_5_start(struct amdgpu_device *adev)for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) +return vcn_v2_5_start_dpg_mode (adev, i,0 ); +/* disable register anti-hang mechanism */ WREG32_P (SOC15_REG_OFFSET (UVD , i, mmUVD_POWER_STATUS),0 , ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK );
@@ -973,6 +1228,35 @@ static int vcn_v2_5_sriov_start(struct amdgpu_device *adev)return vcn_v2_5_mmsch_start (adev, &adev->virt.mm_table); } +static int vcn_v2_5_stop_dpg_mode (struct amdgpu_device *adev,int inst_idx) +{ +int ret_code =0 ; +uint32_t tmp; + +/* Wait for power status to be 1 */ +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +/* wait for read ptr to be equal to write ptr */ + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR); +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RB_RPTR, tmp,0xFFFFFFFF , ret_code); + + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR2); +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RB_RPTR2, tmp,0xFFFFFFFF , ret_code); + + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR) &0x7FFFFFFF ; +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RBC_RB_RPTR, tmp,0xFFFFFFFF , ret_code); + +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +/* disable dynamic power gating mode */ +WREG32_P (SOC15_REG_OFFSET (UVD , inst_idx, mmUVD_POWER_STATUS),0 , + ~UVD_POWER_STATUS__UVD_PG_MODE_MASK ); + +return 0 ; +} +static int vcn_v2_5_stop (struct amdgpu_device *adev) {uint32_t tmp;
@@ -981,6 +1265,12 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; + +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) { + r =vcn_v2_5_stop_dpg_mode (adev, i); + goto power_off; + } +/* wait for vcn idle */ SOC15_WAIT_ON_RREG (VCN , i, mmUVD_STATUS,UVD_STATUS__IDLE ,0x7 , r);if (r)
@@ -1030,6 +1320,7 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev) ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK); } +power_off:if (adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, false);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/6 drm/amdgpu/vcn2.5: add DPG mode start and stop
Add DPG mode start and stop functions for vcn2.5
v2: Correct firmware ucode index in vcn_v2_5_mc_resume_dpg_mode
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 295 +++++++++++++++++++++++++++++++++- 1 file changed, 293 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +293 -2
@@ -48,6 +48,11 @@#define mmUVD_LMI_RBC_IB_64BIT_BAR_HIGH_INTERNAL_OFFSET 0x3b5#define mmUVD_RBC_IB_SIZE_INTERNAL_OFFSET 0x25c +#define mmUVD_RBC_XX_IB_REG_CHECK 0x026b +#define mmUVD_RBC_XX_IB_REG_CHECK_BASE_IDX 1 +#define mmUVD_REG_XX_MASK 0x026c +#define mmUVD_REG_XX_MASK_BASE_IDX 1 +#define VCN25_MAX_HW_INSTANCES_ARCTURUS 2static void vcn_v2_5_set_dec_ring_funcs (struct amdgpu_device *adev);
@@ -286,7 +291,8 @@ static int vcn_v2_5_hw_init(void *handle) done:if (!r) -DRM_INFO ("VCN decode and encode initialized successfully.\n" ); +DRM_INFO ("VCN decode and encode initialized successfully(under %s).\n" , + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )?"DPG Mode" :"SPG Mode" );return r; }
@@ -309,7 +315,9 @@ static int vcn_v2_5_hw_fini(void *handle)continue ; ring = &adev->vcn.inst[i].ring_dec; -if (RREG32_SOC15 (VCN , i, mmUVD_STATUS)) +if ((adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) || + (adev->vcn.cur_state !=AMD_PG_STATE_GATE && +RREG32_SOC15 (VCN , i, mmUVD_STATUS)))vcn_v2_5_set_powergating_state (adev,AMD_PG_STATE_GATE ); ring->sched.ready = false;
@@ -418,6 +426,78 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev) } } +static void vcn_v2_5_mc_resume_dpg_mode (struct amdgpu_device *adev,int inst_idx,bool indirect) +{ +uint32_t size =AMDGPU_GPU_PAGE_ALIGN (adev->vcn.fw->size +4 ); +uint32_t offset; + +/* cache window 0: fw */ +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + inst_idx].tmr_mc_addr_lo),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + inst_idx].tmr_mc_addr_hi),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET0),0 ,0 , indirect); + offset =0 ; + }else { +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr),0 , indirect); + offset = size; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET0), +AMDGPU_UVD_FIRMWARE_OFFSET >>3 ,0 , indirect); + } + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE0), size,0 , indirect); + +/* cache window 1: stack */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET1),0 ,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE1),AMDGPU_VCN_STACK_SIZE ,0 , indirect); + +/* cache window 2: context */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW), +lower_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset +AMDGPU_VCN_STACK_SIZE ),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH), +upper_32_bits (adev->vcn.inst[inst_idx].gpu_addr + offset +AMDGPU_VCN_STACK_SIZE ),0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_OFFSET2),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CACHE_SIZE2),AMDGPU_VCN_CONTEXT_SIZE ,0 , indirect); + +/* non-cache window */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_NC0_64BIT_BAR_LOW),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_VCPU_NC0_64BIT_BAR_HIGH),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_NONCACHE_OFFSET0),0 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_NONCACHE_SIZE0),0 ,0 , indirect); + +/* VCN global tiling registers */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_GFX8_ADDR_CONFIG), adev->gfx.config.gb_addr_config,0 , indirect); +} +/** * vcn_v2_5_disable_clock_gating - disable VCN clock gating *
@@ -536,6 +616,54 @@ static void vcn_v2_5_disable_clock_gating(struct amdgpu_device *adev) } } +static void vcn_v2_5_clock_gating_dpg_mode (struct amdgpu_device *adev, +uint8_t sram_sel,int inst_idx,uint8_t indirect) +{ +uint32_t reg_data =0 ; + +/* enable sw clock gating control */ +if (adev->cg_flags &AMD_CG_SUPPORT_VCN_MGCG ) + reg_data =1 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; +else + reg_data =0 <<UVD_CGC_CTRL__DYN_CLOCK_MODE__SHIFT ; + reg_data |=1 <<UVD_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ; + reg_data |=4 <<UVD_CGC_CTRL__CLK_OFF_DELAY__SHIFT ; + reg_data &= ~(UVD_CGC_CTRL__UDEC_RE_MODE_MASK | +UVD_CGC_CTRL__UDEC_CM_MODE_MASK | +UVD_CGC_CTRL__UDEC_IT_MODE_MASK | +UVD_CGC_CTRL__UDEC_DB_MODE_MASK | +UVD_CGC_CTRL__UDEC_MP_MODE_MASK | +UVD_CGC_CTRL__SYS_MODE_MASK | +UVD_CGC_CTRL__UDEC_MODE_MASK | +UVD_CGC_CTRL__MPEG2_MODE_MASK | +UVD_CGC_CTRL__REGS_MODE_MASK | +UVD_CGC_CTRL__RBC_MODE_MASK | +UVD_CGC_CTRL__LMI_MC_MODE_MASK | +UVD_CGC_CTRL__LMI_UMC_MODE_MASK | +UVD_CGC_CTRL__IDCT_MODE_MASK | +UVD_CGC_CTRL__MPRD_MODE_MASK | +UVD_CGC_CTRL__MPC_MODE_MASK | +UVD_CGC_CTRL__LBSI_MODE_MASK | +UVD_CGC_CTRL__LRBBM_MODE_MASK | +UVD_CGC_CTRL__WCB_MODE_MASK | +UVD_CGC_CTRL__VCPU_MODE_MASK | +UVD_CGC_CTRL__MMSCH_MODE_MASK ); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_CGC_CTRL), reg_data, sram_sel, indirect); + +/* turn off clock gating */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_CGC_GATE),0 , sram_sel, indirect); + +/* turn on SUVD clock gating */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_SUVD_CGC_GATE),1 , sram_sel, indirect); + +/* turn on sw mode in UVD_SUVD_CGC_CTRL */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_SUVD_CGC_CTRL),0 , sram_sel, indirect); +} +/** * vcn_v2_5_enable_clock_gating - enable VCN clock gating *
@@ -598,6 +726,130 @@ static void vcn_v2_5_enable_clock_gating(struct amdgpu_device *adev) } } +static int vcn_v2_5_start_dpg_mode (struct amdgpu_device *adev,int inst_idx,bool indirect) +{ +struct amdgpu_ring *ring; +uint32_t rb_bufsz, tmp; + +/* disable register anti-hang mechanism */ +WREG32_P (SOC15_REG_OFFSET (UVD , inst_idx, mmUVD_POWER_STATUS),1 , + ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK ); +/* enable dynamic power gating mode */ + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_POWER_STATUS); + tmp |=UVD_POWER_STATUS__UVD_PG_MODE_MASK ; + tmp |=UVD_POWER_STATUS__UVD_PG_EN_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_POWER_STATUS, tmp); + +/* enable clock gating */ +vcn_v2_5_clock_gating_dpg_mode (adev,0 , inst_idx, indirect); + +/* enable VCPU clock */ + tmp = (0xFF <<UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT ); + tmp |=UVD_VCPU_CNTL__CLK_EN_MASK ; + tmp |=UVD_VCPU_CNTL__BLK_RST_MASK ; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CNTL), tmp,0 , indirect); + +/* disable master interupt */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MASTINT_EN),0 ,0 , indirect); + +/* setup mmUVD_LMI_CTRL */ + tmp = (0x8 |UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | +UVD_LMI_CTRL__REQ_MODE_MASK | +UVD_LMI_CTRL__CRC_RESET_MASK | +UVD_LMI_CTRL__MASK_MC_URGENT_MASK | +UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | +UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK | + (8 <<UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT ) | +0x00100000L ); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_CTRL), tmp,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_CNTL), +0x2 <<UVD_MPC_CNTL__REPLACEMENT_MODE__SHIFT ,0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUXA0), + ((0x1 <<UVD_MPC_SET_MUXA0__VARA_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXA0__VARA_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXA0__VARA_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXA0__VARA_4__SHIFT )),0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUXB0), + ((0x1 <<UVD_MPC_SET_MUXB0__VARB_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXB0__VARB_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXB0__VARB_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXB0__VARB_4__SHIFT )),0 , indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MPC_SET_MUX), + ((0x0 <<UVD_MPC_SET_MUX__SET_0__SHIFT ) | + (0x1 <<UVD_MPC_SET_MUX__SET_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUX__SET_2__SHIFT )),0 , indirect); + +vcn_v2_5_mc_resume_dpg_mode (adev, inst_idx, indirect); + +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_REG_XX_MASK),0x10 ,0 , indirect); +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_RBC_XX_IB_REG_CHECK),0x3 ,0 , indirect); + +/* enable LMI MC and UMC channels */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_LMI_CTRL2),0 ,0 , indirect); + +/* unblock VCPU register access */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_RB_ARB_CTRL),0 ,0 , indirect); + + tmp = (0xFF <<UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT ); + tmp |=UVD_VCPU_CNTL__CLK_EN_MASK ; +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_VCPU_CNTL), tmp,0 , indirect); + +/* enable master interrupt */ +WREG32_SOC15_DPG_MODE_2_5 (inst_idx,SOC15_DPG_MODE_OFFSET_2_0 ( +UVD , inst_idx, mmUVD_MASTINT_EN), +UVD_MASTINT_EN__VCPU_EN_MASK ,0 , indirect); + + ring = &adev->vcn.inst[inst_idx].ring_dec; +/* force RBC into idle state */ + rb_bufsz =order_base_2 (ring->ring_size); + tmp =REG_SET_FIELD (0 ,UVD_RBC_RB_CNTL ,RB_BUFSZ , rb_bufsz); + tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_BLKSZ ,1 ); + tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_NO_FETCH ,1 ); + 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 (UVD , inst_idx, mmUVD_RBC_RB_CNTL, tmp); + +/* set the write pointer delay */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR_CNTL,0 ); + +/* set the wb address */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR_ADDR, + (upper_32_bits (ring->gpu_addr) >>2 )); + +/* programm the RB_BASE for ring buffer */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_LMI_RBC_RB_64BIT_BAR_LOW, +lower_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH, +upper_32_bits (ring->gpu_addr)); + +/* Initialize the ring buffer's read and write pointers */ +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR,0 ); + +WREG32_SOC15 (UVD , inst_idx, mmUVD_SCRATCH2,0 ); + + ring->wptr =RREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_RPTR); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR, +lower_32_bits (ring->wptr)); + +return 0 ; +} +static int vcn_v2_5_start (struct amdgpu_device *adev) {struct amdgpu_ring *ring;
@@ -610,6 +862,9 @@ static int vcn_v2_5_start(struct amdgpu_device *adev)for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) +return vcn_v2_5_start_dpg_mode (adev, i,0 ); +/* disable register anti-hang mechanism */ WREG32_P (SOC15_REG_OFFSET (UVD , i, mmUVD_POWER_STATUS),0 , ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK );
@@ -973,6 +1228,35 @@ static int vcn_v2_5_sriov_start(struct amdgpu_device *adev)return vcn_v2_5_mmsch_start (adev, &adev->virt.mm_table); } +static int vcn_v2_5_stop_dpg_mode (struct amdgpu_device *adev,int inst_idx) +{ +int ret_code =0 ; +uint32_t tmp; + +/* Wait for power status to be 1 */ +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +/* wait for read ptr to be equal to write ptr */ + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR); +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RB_RPTR, tmp,0xFFFFFFFF , ret_code); + + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR2); +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RB_RPTR2, tmp,0xFFFFFFFF , ret_code); + + tmp =RREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR) &0x7FFFFFFF ; +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_RBC_RB_RPTR, tmp,0xFFFFFFFF , ret_code); + +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +/* disable dynamic power gating mode */ +WREG32_P (SOC15_REG_OFFSET (UVD , inst_idx, mmUVD_POWER_STATUS),0 , + ~UVD_POWER_STATUS__UVD_PG_MODE_MASK ); + +return 0 ; +} +static int vcn_v2_5_stop (struct amdgpu_device *adev) {uint32_t tmp;
@@ -981,6 +1265,12 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ; + +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) { + r =vcn_v2_5_stop_dpg_mode (adev, i); + goto power_off; + } +/* wait for vcn idle */ SOC15_WAIT_ON_RREG (VCN , i, mmUVD_STATUS,UVD_STATUS__IDLE ,0x7 , r);if (r)
@@ -1030,6 +1320,7 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev) ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK); } +power_off:if (adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, false);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu/vcn2.5: add dpg pause mode
In reply to James ZhuAdd dpg pause mode support for vcn2.5
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +70 -0
@@ -60,6 +60,8 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev);static void vcn_v2_5_set_irq_funcs (struct amdgpu_device *adev);static int vcn_v2_5_set_powergating_state (void *handle,enum amd_powergating_state state); +static int vcn_v2_5_pause_dpg_mode (struct amdgpu_device *adev, +int inst_idx,struct dpg_pause_state *new_state);static int vcn_v2_5_sriov_start (struct amdgpu_device *adev);static int amdgpu_ih_clientid_vcns[] = {
@@ -217,6 +219,9 @@ static int vcn_v2_5_sw_init(void *handle)return r; } +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) + adev->vcn.pause_dpg_mode = vcn_v2_5_pause_dpg_mode; +return 0 ; }
@@ -1327,6 +1332,67 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)return 0 ; } +static int vcn_v2_5_pause_dpg_mode (struct amdgpu_device *adev, +int inst_idx,struct dpg_pause_state *new_state) +{ +struct amdgpu_ring *ring; +uint32_t reg_data =0 ; +int ret_code; + +/* pause/unpause if state is changed */ +if (adev->vcn.pause_state.fw_based != new_state->fw_based) { +DRM_DEBUG ("dpg pause state changed %d -> %d" , + adev->vcn.pause_state.fw_based, new_state->fw_based); + reg_data =RREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE) & + (~UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK ); + +if (new_state->fw_based ==VCN_DPG_STATE__PAUSE ) { + ret_code =0 ; +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,0x1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +if (!ret_code) { +/* pause DPG */ + reg_data |=UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE, reg_data); + +/* wait for ACK */ +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_DPG_PAUSE, +UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK , +UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK , ret_code); + +/* Restore */ + ring = &adev->vcn.inst[inst_idx].ring_enc[0 ]; +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_LO, ring->gpu_addr); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_SIZE, ring->ring_size /4 ); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR,lower_32_bits (ring->wptr)); + + ring = &adev->vcn.inst[inst_idx].ring_enc[1 ]; +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_LO2, ring->gpu_addr); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_HI2,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_SIZE2, ring->ring_size /4 ); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); + +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR, +RREG32_SOC15 (UVD , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); + +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS, +0x0 ,UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + } + }else { +/* unpause dpg, no need to wait */ + reg_data &= ~UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE, reg_data); + } + adev->vcn.pause_state.fw_based = new_state->fw_based; + } + +return 0 ; +} +/** * vcn_v2_5_dec_ring_get_rptr - get read pointer *
@@ -1369,6 +1435,10 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) +WREG32_SOC15 (UVD , ring->me, mmUVD_SCRATCH2, +lower_32_bits (ring->wptr) |0x80000000 ); +if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr);WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr));
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 4/6] drm/amdgpu/vcn2.5: add dpg pause mode
Quoted 31 lines · James Zhu
Add dpg pause mode support for vcn2.5
Signed-off-by James Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +5
-0@@ -60,6 +60,8 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev);static void vcn_v2_5_set_irq_funcs (struct amdgpu_device *adev);static int vcn_v2_5_set_powergating_state (void *handle,enum amd_powergating_state state); +static int vcn_v2_5_pause_dpg_mode (struct amdgpu_device *adev, +int inst_idx,struct dpg_pause_state *new_state);static int vcn_v2_5_sriov_start (struct amdgpu_device *adev);static int amdgpu_ih_clientid_vcns[] = {@@ -217,6 +219,9 @@ static int vcn_v2_5_sw_init(void *handle)return r; } +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) + adev->vcn.pause_dpg_mode = vcn_v2_5_pause_dpg_mode; +return 0 ; }
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static int vcn_v2_5_stop(struct amdgpu_device *adev) · line 1336
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2
-0@@ -1327,6 +1332,67 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)return 0 ; } +static int vcn_v2_5_pause_dpg_mode (struct amdgpu_device *adev, +int inst_idx,struct dpg_pause_state *new_state)
I think here is the same thing, add instance to v2_0, and avoid the duplication.
Regards,
Leo
Quoted 63 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +59
-0+{ +struct amdgpu_ring *ring; +uint32_t reg_data =0 ; +int ret_code; + +/* pause/unpause if state is changed */ +if (adev->vcn.pause_state.fw_based != new_state->fw_based) { +DRM_DEBUG ("dpg pause state changed %d -> %d" , + adev->vcn.pause_state.fw_based, new_state->fw_based); + reg_data =RREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE) & + (~UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK ); + +if (new_state->fw_based ==VCN_DPG_STATE__PAUSE ) { + ret_code =0 ; +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS,0x1 , +UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + +if (!ret_code) { +/* pause DPG */ + reg_data |=UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE, reg_data); + +/* wait for ACK */ +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_DPG_PAUSE, +UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK , +UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK , ret_code); + +/* Restore */ + ring = &adev->vcn.inst[inst_idx].ring_enc[0 ]; +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_LO, ring->gpu_addr); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_SIZE, ring->ring_size /4 ); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR,lower_32_bits (ring->wptr)); + + ring = &adev->vcn.inst[inst_idx].ring_enc[1 ]; +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_LO2, ring->gpu_addr); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_BASE_HI2,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_SIZE2, ring->ring_size /4 ); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32_SOC15 (UVD , inst_idx, mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); + +WREG32_SOC15 (UVD , inst_idx, mmUVD_RBC_RB_WPTR, +RREG32_SOC15 (UVD , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); + +SOC15_WAIT_ON_RREG (UVD , inst_idx, mmUVD_POWER_STATUS, +0x0 ,UVD_POWER_STATUS__UVD_POWER_STATUS_MASK , ret_code); + } + }else { +/* unpause dpg, no need to wait */ + reg_data &= ~UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK ; +WREG32_SOC15 (UVD , inst_idx, mmUVD_DPG_PAUSE, reg_data); + } + adev->vcn.pause_state.fw_based = new_state->fw_based; + } + +return 0 ; +} +/** * vcn_v2_5_dec_ring_get_rptr - get read pointer *
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) · line 1444
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4
-0@@ -1369,6 +1435,10 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) +WREG32_SOC15 (UVD , ring->me, mmUVD_SCRATCH2, +lower_32_bits (ring->wptr) |0x80000000 ); +if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr);WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr));
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 4/6] drm/amdgpu/vcn2.5: add dpg pause mode
Quoted 30 lines · Leo Liu
Quoted 28 lines · James Zhu
Add dpg pause mode support for vcn2.5
Signed-off-by James Zhu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c| 70
+++++++++++++++++++++++++++++++++++1 file changed, 70 insertions(+)drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4
-0@@ -60,6 +60,8 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev); static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev); static int vcn_v2_5_set_powergating_state(void *handle, enum amd_powergating_state state); +static int vcn_v2_5_pause_dpg_mode (struct amdgpu_device *adev, + int inst_idx, struct dpg_pause_state *new_state); static int vcn_v2_5_sriov_start(struct amdgpu_device *adev); static int amdgpu_ih_clientid_vcns[] = {@@ -217,6 +219,9 @@ static int vcn_v2_5_sw_init(void *handle) return r; } + if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) + adev->vcn.pause_dpg_mode = vcn_v2_5_pause_dpg_mode; + return 0;
Quoted 9 lines
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0
-0} @@ -1327,6 +1332,67 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)return 0;
}
+static int vcn_v2_5_pause_dpg_mode(structamdgpu_device*adev, + intinst_idx, structdpg_pause_state*new_state)I think here is the same thing, add instance to
v2_0, and avoid the duplication.
vcn2.5 and vcn2.0 are not exactly the same.
James
Quoted 83 lines
Regards,
Leo
Quoted 77 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +30
-0+{ + struct amdgpu_ring *ring; + uint32_t reg_data = 0; + int ret_code; + + /* pause/unpause if state is changed */ + if (adev->vcn.pause_state.fw_based != new_state->fw_based) { + DRM_DEBUG("dpg pause state changed %d -> %d", + adev->vcn.pause_state.fw_based, new_state->fw_based); + reg_data = RREG32_SOC15(UVD, inst_idx, mmUVD_DPG_PAUSE) & + (~UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK); + + if (new_state->fw_based == VCN_DPG_STATE__PAUSE) { + ret_code = 0; + SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_POWER_STATUS, 0x1, + UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); + + if (!ret_code) { + /* pause DPG */ + reg_data |= UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK; + WREG32_SOC15(UVD, inst_idx, mmUVD_DPG_PAUSE, reg_data); + + /* wait for ACK */ + SOC15_WAIT_ON_RREG(UVD, inst_idx, mmUVD_DPG_PAUSE, + UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, + UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK, ret_code); + + /* Restore */ + ring = &adev->vcn.inst[inst_idx].ring_enc[0]; + WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_LO,
ring->gpu_addr);
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_HI, upper_32_bits(ring->gpu_addr));
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_SIZE, ring->ring_size / 4);
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_RPTR, lower_32_bits(ring->wptr));
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_WPTR, lower_32_bits(ring->wptr));
+
+ ring = &adev->vcn.inst[inst_idx].ring_enc[1]; +WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_LO2, ring->gpu_addr);
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_BASE_HI2, upper_32_bits(ring->gpu_addr));
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_SIZE2, ring->ring_size / 4);
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_RPTR2, lower_32_bits(ring->wptr));
+WREG32_SOC15(UVD, inst_idx, mmUVD_RB_WPTR2, lower_32_bits(ring->wptr));
+
+ WREG32_SOC15(UVD,inst_idx,mmUVD_RBC_RB_WPTR, +RREG32_SOC15(UVD, inst_idx, mmUVD_SCRATCH2)&0x7FFFFFFF);
+
+ SOC15_WAIT_ON_RREG(UVD,inst_idx,mmUVD_POWER_STATUS, +0x0,UVD_POWER_STATUS__UVD_POWER_STATUS_MASK,ret_code);
+ }
+ } else {
+ /* unpause dpg, no need to wait */
+reg_data&= ~UVD_DPG_PAUSE__NJ_PAUSE_DPG_REQ_MASK; +WREG32_SOC15(UVD, inst_idx, mmUVD_DPG_PAUSE, reg_data); + }
+adev->vcn.pause_state.fw_based=new_state->fw_based; + }drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4
-0+ + return 0; +} +/**
*vcn_v2_5_dec_ring_get_rptr- get read pointer *drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0
-0@@ -1369,6 +1435,10 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) {
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +3
-0struct amdgpu_device *adev = ring->adev; + if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) + WREG32_SOC15(UVD, ring->me, mmUVD_SCRATCH2, + lower_32_bits(ring->wptr) | 0x80000000); + if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu/vcn: support multiple-instance dpg sram mode
In reply to James ZhuAdd multiple-instance dpg sram mode support for vcn2.5
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 27 +++++++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 8 ++++---- 3 files changed, 23 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +13 -14
@@ -165,15 +165,15 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)dev_err (adev->dev,"(%d) failed to allocate vcn bo\n" , r);return r; } - } -if (adev->vcn.indirect_sram) { - r =amdgpu_bo_create_kernel (adev,64 *2 *4 ,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_VRAM , &adev->vcn.dpg_sram_bo, - &adev->vcn.dpg_sram_gpu_addr, &adev->vcn.dpg_sram_cpu_addr); -if (r) { -dev_err (adev->dev,"(%d) failed to allocate DPG bo\n" , r); -return r; +if (adev->vcn.indirect_sram) { + r =amdgpu_bo_create_kernel (adev,64 *2 *4 ,PAGE_SIZE , +AMDGPU_GEM_DOMAIN_VRAM , &adev->vcn.inst[i].dpg_sram_bo, + &adev->vcn.inst[i].dpg_sram_gpu_addr, &adev->vcn.inst[i].dpg_sram_cpu_addr); +if (r) { +dev_err (adev->dev,"VCN %d (%d) failed to allocate DPG bo\n" , i, r); +return r; + } } }
@@ -186,15 +186,14 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)cancel_delayed_work_sync (&adev->vcn.idle_work); -if (adev->vcn.indirect_sram) { -amdgpu_bo_free_kernel (&adev->vcn.dpg_sram_bo, - &adev->vcn.dpg_sram_gpu_addr, - (void **)&adev->vcn.dpg_sram_cpu_addr); - } -for (j =0 ; j < adev->vcn.num_vcn_inst; ++j) {if (adev->vcn.harvest_config & (1 << j))continue ; +if (adev->vcn.indirect_sram) { +amdgpu_bo_free_kernel (&adev->vcn.inst[i].dpg_sram_bo, + &adev->vcn.inst[i].dpg_sram_gpu_addr, + (void **)&adev->vcn.inst[i].dpg_sram_cpu_addr); + }kvfree (adev->vcn.inst[j].saved_bo); amdgpu_bo_free_kernel(&adev->vcn.inst[j].vcpu_bo,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +6 -6
@@ -122,8 +122,8 @@ mask_en <<UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ }else { \ - *adev->vcn.dpg_sram_curr_addr++ = offset; \ - *adev->vcn.dpg_sram_curr_addr++ = value; \ + *adev->vcn.inst->dpg_sram_curr_addr++ = offset; \ + *adev->vcn.inst->dpg_sram_curr_addr++ = value; \ } \ }while (0 )
@@ -191,6 +191,10 @@ struct amdgpu_vcn_inst {struct amdgpu_ring ring_enc[AMDGPU_VCN_MAX_ENC_RINGS ];struct amdgpu_irq_src irq;struct amdgpu_vcn_reg external; +struct amdgpu_bo *dpg_sram_bo; +void *dpg_sram_cpu_addr; +uint64_t dpg_sram_gpu_addr; +uint32_t *dpg_sram_curr_addr; };struct amdgpu_vcn {
@@ -202,10 +206,6 @@ struct amdgpu_vcn {struct dpg_pause_state pause_state;bool indirect_sram; -struct amdgpu_bo *dpg_sram_bo; -void *dpg_sram_cpu_addr; -uint64_t dpg_sram_gpu_addr; -uint32_t *dpg_sram_curr_addr;uint8_t num_vcn_inst;struct amdgpu_vcn_inst inst[AMDGPU_MAX_VCN_INSTANCES ];
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +4 -4
@@ -759,7 +759,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)WREG32_SOC15 (UVD ,0 , mmUVD_POWER_STATUS, tmp);if (indirect) - adev->vcn.dpg_sram_curr_addr = (uint32_t *)adev->vcn.dpg_sram_cpu_addr; + adev->vcn.inst->dpg_sram_curr_addr = (uint32_t *)adev->vcn.inst->dpg_sram_cpu_addr;/* enable clock gating */ vcn_v2_0_clock_gating_dpg_mode (adev,0 , indirect);
@@ -833,9 +833,9 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect) UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);if (indirect) -psp_update_vcn_sram (adev,0 , adev->vcn.dpg_sram_gpu_addr, - (uint32_t )((uintptr_t )adev->vcn.dpg_sram_curr_addr - - (uintptr_t )adev->vcn.dpg_sram_cpu_addr)); +psp_update_vcn_sram (adev,0 , adev->vcn.inst->dpg_sram_gpu_addr, + (uint32_t )((uintptr_t )adev->vcn.inst->dpg_sram_curr_addr - + (uintptr_t )adev->vcn.inst->dpg_sram_cpu_addr));/* force RBC into idle state */ rb_bufsz =order_base_2 (ring->ring_size);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu/vcn2.5: implement indirect DPG SRAM mode
In reply to James ZhuImplement indirect DPG SRAM mode for vcn2.5
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 15 ++++--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 69 +++++++++++++++++++++++---------- 3 files changed, 62 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3 -0
@@ -75,6 +75,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)break ;case CHIP_ARCTURUS : fw_name =FIRMWARE_ARCTURUS ; +if ((adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) && + (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG )) + adev->vcn.indirect_sram = true;break ;case CHIP_RENOIR : fw_name =FIRMWARE_RENOIR ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +10 -5
@@ -138,11 +138,16 @@#define WREG32_SOC15_DPG_MODE_2_5 (inst_idx, offset, value, mask_en, indirect) \ do { \ - WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA, value); \ - WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_CTL, \ - (0x1 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ - mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ - offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ + if (!indirect) { \ + WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_DATA, value); \ + WREG32_SOC15(VCN, inst_idx, mmUVD_DPG_LMA_CTL, \ + (0x1 << UVD_DPG_LMA_CTL__READ_WRITE__SHIFT | \ + mask_en << UVD_DPG_LMA_CTL__MASK_EN__SHIFT | \ + offset << UVD_DPG_LMA_CTL__READ_WRITE_ADDR__SHIFT)); \ + } else { \ + *adev->vcn.inst[inst_idx].dpg_sram_curr_addr++ = offset; \ + *adev->vcn.inst[inst_idx].dpg_sram_curr_addr++ = value; \ + } \ } while (0)enum engine_status_constants {
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +49 -20
101 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx