Various tidy-ups for VCE/UVD
Subsystems (2)
Various cleanups using WREG32_FIELD as well as a bug fix in the soft_reset check for VCEv3 which didn't hold the GRBM lock around accessing GRBM_GFX_IDX.
_______________________________________________
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/4 drm/amd/amdgpu: Cleanup register access in VCE v3
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 145 ++++++++++------------------------ 1 file changed, 43 insertions(+), 102 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +43 -102
@@ -110,22 +110,13 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override) { -u32 tmp, data; - - tmp = data =RREG32 (mmVCE_RB_ARB_CTRL); -if (override) - data |=VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; -else - data &= ~VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; - -if (tmp != data) -WREG32 (mmVCE_RB_ARB_CTRL, data); +WREG32_FIELD (VCE_RB_ARB_CTRL ,VCE_CGTT_OVERRIDE , override ?1 :0 ); }static void vce_v3_0_set_vce_sw_clock_gating (struct amdgpu_device *adev,bool gated) { -u32 tmp, data; +u32 data;/* Set Override to disable Clock Gating */ vce_v3_0_override_vce_clock_gating (adev, true);
@@ -136,65 +127,55 @@ static void vce_v3_0_set_vce_sw_clock_gating(struct amdgpu_device *adev,fly as necessary. */ if (gated) { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data |=0x1ff ; data &= ~0xef0000 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0x3ff000 ; data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x2 ; data &= ~0x00010000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data |=0x37f ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data |=VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ; -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }else { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data &= ~0x80010 ; data |=0xe70008 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x10000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data &= ~(VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ); -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }vce_v3_0_override_vce_clock_gating (adev, false); }
@@ -213,12 +194,9 @@ static int vce_v3_0_firmware_loaded(struct amdgpu_device *adev) }DRM_ERROR ("VCE not responding, trying to reset the ECPU!!!\n" ); -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); }
@@ -256,34 +234,22 @@ static int vce_v3_0_start(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); - +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);vce_v3_0_mc_resume (adev, idx); - -WREG32_P (mmVCE_STATUS,VCE_STATUS__JOB_BUSY_MASK , - ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,1 );if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,1 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); - -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (100 ); r =vce_v3_0_firmware_loaded (adev);/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );if (r) {DRM_ERROR ("VCE not responding, giving up!!!\n" );
@@ -292,7 +258,7 @@ static int vce_v3_0_start(struct amdgpu_device *adev) } } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;
@@ -307,33 +273,25 @@ static int vce_v3_0_stop(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,0 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,0 , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +/* hold on ECPU */ -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );/* Set Clock-Gating off */ if (adev->cg_flags &AMD_CG_SUPPORT_VCE_MGCG )vce_v3_0_set_vce_sw_clock_gating (adev, false); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;
@@ -561,9 +519,7 @@ static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx) }WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK ); +WREG32_FIELD (VCE_SYS_INT_EN ,VCE_SYS_INT_TRAP_INTERRUPT_EN ,1 ); }static bool vce_v3_0_is_idle (void *handle)
@@ -599,7 +555,6 @@ static int vce_v3_0_check_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;u32 srbm_soft_reset =0 ; -u32 tmp;/* According to VCE team , we should use VCE_STATUS instead * SRBM_STATUS.VCE_BUSY bit for busy status checking.
@@ -614,23 +569,17 @@ static int vce_v3_0_check_soft_reset(void *handle)* * VCE team suggest use bit 3--bit 6 for busy status check */ - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (srbm_soft_reset) { adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE ].hang = true;
@@ -718,9 +667,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev, {DRM_DEBUG ("IH: VCE\n" ); -WREG32_P (mmVCE_SYS_INT_STATUS, -VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK , - ~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK ); +WREG32_FIELD (VCE_SYS_INT_STATUS ,VCE_SYS_INT_TRAP_INTERRUPT_INT ,1 );switch (entry->src_data) {case 0 :
@@ -767,13 +714,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,if (adev->vce.harvest_config & (1 << i))continue ; -if (i ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , i);if (enable) {/* initialize VCE_CLOCK_GATING_A: Clock ON/OFF delay */
@@ -792,7 +733,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,vce_v3_0_set_vce_sw_clock_gating (adev, enable); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;
Signature · 6 lines
2.9.2 _______________________________________________ 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
Reviewed-byRe: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3
Am 11.08.2016 um 16:32 schrieb Tom St Denis:
Quoted 1 line
Signed-off-by Tom St Denis <[email protected]>
Regards,
Christian.
Quoted 296 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 145 ++++++++++------------------------ 1 file changed, 43 insertions(+), 102 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +42
-101@@ -110,22 +110,13 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override) { -u32 tmp, data; - - tmp = data =RREG32 (mmVCE_RB_ARB_CTRL); -if (override) - data |=VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; -else - data &= ~VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; - -if (tmp != data) -WREG32 (mmVCE_RB_ARB_CTRL, data); +WREG32_FIELD (VCE_RB_ARB_CTRL ,VCE_CGTT_OVERRIDE , override ?1 :0 ); }static void vce_v3_0_set_vce_sw_clock_gating (struct amdgpu_device *adev,bool gated) { -u32 tmp, data; +u32 data;/* Set Override to disable Clock Gating */ vce_v3_0_override_vce_clock_gating (adev, true);@@ -136,65 +127,55 @@ static void vce_v3_0_set_vce_sw_clock_gating(struct amdgpu_device *adev,fly as necessary. */ if (gated) { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data |=0x1ff ; data &= ~0xef0000 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0x3ff000 ; data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x2 ; data &= ~0x00010000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data |=0x37f ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data |=VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ; -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }else { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data &= ~0x80010 ; data |=0xe70008 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x10000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data &= ~(VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK |VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK |0x8 ); -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }vce_v3_0_override_vce_clock_gating (adev, false); }@@ -213,12 +194,9 @@ static int vce_v3_0_firmware_loaded(struct amdgpu_device *adev) }DRM_ERROR ("VCE not responding, trying to reset the ECPU!!!\n" ); -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); }@@ -256,34 +234,22 @@ static int vce_v3_0_start(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); - +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);vce_v3_0_mc_resume (adev, idx); - -WREG32_P (mmVCE_STATUS,VCE_STATUS__JOB_BUSY_MASK , - ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,1 );if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,1 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); - -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (100 ); r =vce_v3_0_firmware_loaded (adev);/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );if (r) {DRM_ERROR ("VCE not responding, giving up!!!\n" );@@ -292,7 +258,7 @@ static int vce_v3_0_start(struct amdgpu_device *adev) } } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;@@ -307,33 +273,25 @@ static int vce_v3_0_stop(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,0 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,0 , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +/* hold on ECPU */ -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );/* Set Clock-Gating off */ if (adev->cg_flags &AMD_CG_SUPPORT_VCE_MGCG )vce_v3_0_set_vce_sw_clock_gating (adev, false); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;@@ -561,9 +519,7 @@ static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx) }WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK ); +WREG32_FIELD (VCE_SYS_INT_EN ,VCE_SYS_INT_TRAP_INTERRUPT_EN ,1 ); }static bool vce_v3_0_is_idle (void *handle)@@ -599,7 +555,6 @@ static int vce_v3_0_check_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;u32 srbm_soft_reset =0 ; -u32 tmp;/* According to VCE team , we should use VCE_STATUS instead * SRBM_STATUS.VCE_BUSY bit for busy status checking. @@ -614,23 +569,17 @@ static int vce_v3_0_check_soft_reset(void *handle)* * VCE team suggest use bit 3--bit 6 for busy status check */ - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 ); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (srbm_soft_reset) { adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE ].hang = true;@@ -718,9 +667,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev, {DRM_DEBUG ("IH: VCE\n" ); -WREG32_P (mmVCE_SYS_INT_STATUS, -VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK , - ~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK ); +WREG32_FIELD (VCE_SYS_INT_STATUS ,VCE_SYS_INT_TRAP_INTERRUPT_INT ,1 );switch (entry->src_data) {case 0 :@@ -767,13 +714,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,if (adev->vce.harvest_config & (1 << i))continue ; -if (i ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , i);if (enable) {/* initialize VCE_CLOCK_GATING_A: Clock ON/OFF delay */
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c static int vce_v3_0_set_clockgating_state(void *handle, · line 739
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1@@ -792,7 +733,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,vce_v3_0_set_vce_sw_clock_gating (adev, enable); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK ); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3
In reply to a message not in the archiveQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3Signed-off-by Tom St Denis <[email protected]>
This potentially adds a bunch of unnecessary register writes which increases latency on VCE power up.
Alex
Quoted 362 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 145 ++++++++++----------------- ------- 1 file changed, 43 insertions(+), 102 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-10@@ -110,22 +110,13 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override) { -u32 tmp, data; - - tmp = data =RREG32 (mmVCE_RB_ARB_CTRL); -if (override) - data |=VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; -else - data &= ~VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; - -if (tmp != data) - WREG32(mmVCE_RB_ARB_CTRL, data); +WREG32_FIELD (VCE_RB_ARB_CTRL ,VCE_CGTT_OVERRIDE , override ?1 :0 ); }static void vce_v3_0_set_vce_sw_clock_gating (struct amdgpu_device *adev,bool gated){
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +10
-14-u32 tmp, data; +u32 data;/* Set Override to disable Clock Gating */ vce_v3_0_override_vce_clock_gating (adev, true);@@ -136,65 +127,55 @@ static voidvce_v3_0_set_vce_sw_clock_gating(struct amdgpu_device *adev, fly as necessary. */ if (gated) { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data |=0x1ff ; data &= ~0xef0000 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0x3ff000 ; data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x2 ; data &= ~0x00010000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data |=0x37f ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data |=
VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK|
VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK|
VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK|drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +8
-140x8 ; -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }else { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data &= ~0x80010 ; data |=0xe70008 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x10000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data &= ~0xffc00000 ; -if (tmp != data) - WREG32(mmVCE_UENC_REG_CLOCK_GATING,data);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-1+WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data &=~(VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |
VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK|
VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK|drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-70x8); -if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }vce_v3_0_override_vce_clock_gating (adev, false); }@@ -213,12 +194,9 @@ static int vce_v3_0_firmware_loaded(struct amdgpu_device *adev) } DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 );drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +4
-16}@@ -256,34 +234,22 @@ static int vce_v3_0_start(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); - +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);vce_v3_0_mc_resume (adev, idx); - -WREG32_P (mmVCE_STATUS,VCE_STATUS__JOB_BUSY_MASK , - ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,1 );if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,1 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); - -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (100 ); r =vce_v3_0_firmware_loaded (adev);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-1/* clear BUSY flag */ - WREG32_P(mmVCE_STATUS, 0,~VCE_STATUS__JOB_BUSY_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-1+WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );if (r) {DRM_ERROR ("VCE not responding, giving up!!!\n" );@@ -292,7 +258,7 @@ static int vce_v3_0_start(struct amdgpu_device *adev) } } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +5
-14return 0 ;@@ -307,33 +273,25 @@ static int vce_v3_0_stop(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,0 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,0 , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +/* hold on ECPU */ -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );/* Set Clock-Gating off */ if (adev->cg_flags &AMD_CG_SUPPORT_VCE_MGCG )vce_v3_0_set_vce_sw_clock_gating (adev, false); } - WREG32_P(mmGRBM_GFX_INDEX, 0,~GRBM_GFX_INDEX__VCE_INSTANCE_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-3+WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;@@ -561,9 +519,7 @@ static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx) } WREG32_P(mmVCE_LMI_CTRL2, 0x0, ~0x100); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);
}static bool
vce_v3_0_is_idle(void *handle)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-7@@ -599,7 +555,6 @@ static int vce_v3_0_check_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;u32 srbm_soft_reset =0 ; -u32 tmp;/* According to VCE team , we should use VCE_STATUS instead * SRBM_STATUS.VCE_BUSY bit for busy status checking. @@ -614,23 +569,17 @@ static int vce_v3_0_check_soft_reset(void*handle) * * VCE team suggest use bit 3--bit 6 for busy status check */ - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX , 0); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX , 0x10); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset,
SRBM_SOFT_RESET,SOFT_RESET_VCE0, 1);
srbm_soft_reset= REG_SET_FIELD(srbm_soft_reset,SRBM_SOFT_RESET,SOFT_RESET_VCE1, 1);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-2} - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp = REG_SET_FIELD(tmp, GRBM_GFX_INDEX, INSTANCE_INDEX,0);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1-WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (srbm_soft_reset) { adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE].hang =true;
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-3@@ -718,9 +667,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev, {DRM_DEBUG ("IH: VCE\n" ); - WREG32_P(mmVCE_SYS_INT_STATUS, -VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MAS K, -~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MA
SK);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-0+ WREG32_FIELD(VCE_SYS_INT_STATUS,
VCE_SYS_INT_TRAP_INTERRUPT_INT, 1);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-7switch (entry->src_data) {case 0 :@@ -767,13 +714,7 @@ static int vce_v3_0_set_clockgating_state(void *handle, if (adev->vce.harvest_config & (1 << i)) continue; -if (i ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else - WREG32_P(mmGRBM_GFX_INDEX, - GRBM_GFX_INDEX__VCE_INSTANCE_MASK, -~GRBM_GFX_INDEX__VCE_INSTANCE_MASK);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-0+WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , i);if (enable) {/* initialize VCE_CLOCK_GATING_A: Clock ON/OFF delay */
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1@@ -792,7 +733,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,vce_v3_0_set_vce_sw_clock_gating (adev, enable); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);
Quoted 8 lines
return 0;
--
2.9.2_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB169403F24E091D033BEE21F6F71E0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3
Sorta. The switch from gate/ungate for instance is kinda mutually exclusive. The device won't be gated when calling gate or ungated when calling ungate. The other conditional writes are similar.
Tom
________________________________
From: Deucher, Alexander
Sent: Thursday, August 11, 2016 11:41
To: 'Tom St Denis'; [email protected]
Cc: StDenis, Tom
Subject: RE: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 1/4] drm/amd/amdgpu: Cleanup register access in VCE v3Signed-off-by Tom St Denis <[email protected]>
This potentially adds a bunch of unnecessary register writes which increases latency on VCE power up.
Alex
Quoted 362 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 145 ++++++++++----------------- ------- 1 file changed, 43 insertions(+), 102 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-10@@ -110,22 +110,13 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override) { -u32 tmp, data; - - tmp = data =RREG32 (mmVCE_RB_ARB_CTRL); -if (override) - data |=VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; -else - data &= ~VCE_RB_ARB_CTRL__VCE_CGTT_OVERRIDE_MASK ; - -if (tmp != data) - WREG32(mmVCE_RB_ARB_CTRL, data); +WREG32_FIELD (VCE_RB_ARB_CTRL ,VCE_CGTT_OVERRIDE , override ?1 :0 ); }static void vce_v3_0_set_vce_sw_clock_gating (struct amdgpu_device *adev,bool gated){
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +10
-14-u32 tmp, data; +u32 data;/* Set Override to disable Clock Gating */ vce_v3_0_override_vce_clock_gating (adev, true);@@ -136,65 +127,55 @@ static voidvce_v3_0_set_vce_sw_clock_gating(struct amdgpu_device *adev, fly as necessary. */ if (gated) { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data |=0x1ff ; data &= ~0xef0000 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0x3ff000 ; data &= ~0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x2 ; data &= ~0x00010000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data |=0x37f ; -if (tmp != data) -WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data |=
VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK|VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK | VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK | 0x8;drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +8
-14-if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }else { - tmp = data =RREG32 (mmVCE_CLOCK_GATING_B); + data =RREG32 (mmVCE_CLOCK_GATING_B); data &= ~0x80010 ; data |=0xe70008 ; -if (tmp != data) -WREG32 (mmVCE_CLOCK_GATING_B, data); +WREG32 (mmVCE_CLOCK_GATING_B, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_CLOCK_GATING); data |=0xffc00000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING, data); +WREG32 (mmVCE_UENC_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); + data =RREG32 (mmVCE_UENC_CLOCK_GATING_2); data |=0x10000 ; -if (tmp != data) -WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); +WREG32 (mmVCE_UENC_CLOCK_GATING_2, data); - tmp = data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); + data =RREG32 (mmVCE_UENC_REG_CLOCK_GATING); data &= ~0xffc00000 ; -if (tmp != data) - WREG32(mmVCE_UENC_REG_CLOCK_GATING,data);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-1+WREG32 (mmVCE_UENC_REG_CLOCK_GATING, data); - tmp = data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); + data =RREG32 (mmVCE_UENC_DMA_DCLK_CTRL); data &=~(VCE_UENC_DMA_DCLK_CTRL__WRDMCLK_FORCEON_MASK |
VCE_UENC_DMA_DCLK_CTRL__RDDMCLK_FORCEON_MASK|
VCE_UENC_DMA_DCLK_CTRL__REGCLK_FORCEON_MASK|0x8);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-7-if (tmp != data) -WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); +WREG32 (mmVCE_UENC_DMA_DCLK_CTRL, data); }vce_v3_0_override_vce_clock_gating (adev, false); }@@ -213,12 +194,9 @@ static int vce_v3_0_firmware_loaded(struct amdgpu_device *adev) } DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 );}drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +4
-16@@ -256,34 +234,22 @@ static int vce_v3_0_start(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); - +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);vce_v3_0_mc_resume (adev, idx); - -WREG32_P (mmVCE_STATUS,VCE_STATUS__JOB_BUSY_MASK , - ~VCE_STATUS__JOB_BUSY_MASK ); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,1 );if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,1 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); - -WREG32_P (mmVCE_SOFT_RESET,0 , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (100 ); r =vce_v3_0_firmware_loaded (adev);/* clear BUSY flag */- WREG32_P(mmVCE_STATUS, 0,
~VCE_STATUS__JOB_BUSY_MASK);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-1+WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );if (r) {DRM_ERROR ("VCE not responding, giving up!!!\n" );@@ -292,7 +258,7 @@ static int vce_v3_0_start(struct amdgpu_device *adev) } } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0;drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +5
-14@@ -307,33 +273,25 @@ static int vce_v3_0_stop(struct amdgpu_device *adev)if (adev->vce.harvest_config & (1 << idx))continue ; -if (idx ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , idx);if (adev->asic_type >=CHIP_STONEY )WREG32_P (mmVCE_VCPU_CNTL,0 , ~0x200001 );else -WREG32_P (mmVCE_VCPU_CNTL,0 , - ~VCE_VCPU_CNTL__CLK_EN_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +/* hold on ECPU */ -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );/* clear BUSY flag */ -WREG32_P (mmVCE_STATUS,0 , ~VCE_STATUS__JOB_BUSY_MASK); +WREG32_FIELD (VCE_STATUS ,JOB_BUSY ,0 );/* Set Clock-Gating off */ if (adev->cg_flags &AMD_CG_SUPPORT_VCE_MGCG )vce_v3_0_set_vce_sw_clock_gating (adev, false); } - WREG32_P(mmGRBM_GFX_INDEX, 0,~GRBM_GFX_INDEX__VCE_INSTANCE_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-3+WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);return 0 ;@@ -561,9 +519,7 @@ static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx) } WREG32_P(mmVCE_LMI_CTRL2, 0x0, ~0x100); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);
}static bool
vce_v3_0_is_idle(void *handle)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2
-7@@ -599,7 +555,6 @@ static int vce_v3_0_check_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;u32 srbm_soft_reset =0 ; -u32 tmp;/* According to VCE team , we should use VCE_STATUS instead * SRBM_STATUS.VCE_BUSY bit for busy status checking. @@ -614,23 +569,17 @@ static int vce_v3_0_check_soft_reset(void*handle) * * VCE team suggest use bit 3--bit 6 for busy status check */ - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX , 0); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 ); srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE1 ,1 ); } - tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp =REG_SET_FIELD (tmp,GRBM_GFX_INDEX ,INSTANCE_INDEX , 0x10); -WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0x10 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset,
SRBM_SOFT_RESET,SOFT_RESET_VCE0, 1);
srbm_soft_reset= REG_SET_FIELD(srbm_soft_reset,SRBM_SOFT_RESET, SOFT_RESET_VCE1, 1); }drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-2- tmp =RREG32 (mmGRBM_GFX_INDEX); - tmp = REG_SET_FIELD(tmp, GRBM_GFX_INDEX, INSTANCE_INDEX,0);
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1-WREG32 (mmGRBM_GFX_INDEX, tmp); +WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (srbm_soft_reset) { adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE].hang =true;
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +0
-3@@ -718,9 +667,7 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev, {DRM_DEBUG ("IH: VCE\n" ); -WREG32_P (mmVCE_SYS_INT_STATUS, -VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MAS K , - ~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK);
+ WREG32_FIELD(VCE_SYS_INT_STATUS,VCE_SYS_INT_TRAP_INTERRUPT_INT, 1);switch (entry->src_data) { case 0:drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-7@@ -767,13 +714,7 @@ static int vce_v3_0_set_clockgating_state(void *handle, if (adev->vce.harvest_config & (1 << i)) continue; -if (i ==0 ) -WREG32_P (mmGRBM_GFX_INDEX,0 , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); -else -WREG32_P (mmGRBM_GFX_INDEX, -GRBM_GFX_INDEX__VCE_INSTANCE_MASK , - ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE , i);if (enable) {/* initialize VCE_CLOCK_GATING_A: Clock ON/OFF delay */
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1@@ -792,7 +733,7 @@ static int vce_v3_0_set_clockgating_state(void *handle,vce_v3_0_set_vce_sw_clock_gating (adev, enable); } -WREG32_P (mmGRBM_GFX_INDEX,0 , ~GRBM_GFX_INDEX__VCE_INSTANCE_MASK); +WREG32_FIELD (GRBM_GFX_INDEX ,VCE_INSTANCE ,0 );mutex_unlock (&adev->grbm_idx_mutex);
Quoted 8 lines
return 0;--
2.9.2_______________________________________________
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
PATCH 2/4 drm/amd/amdgpu: add mutex in check_soft for VCE v3
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2 -0
@@ -569,6 +569,7 @@ static int vce_v3_0_check_soft_reset(void *handle)* * VCE team suggest use bit 3--bit 6 for busy status check */ +mutex_lock (&adev->grbm_idx_mutex);WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) { srbm_soft_reset =REG_SET_FIELD (srbm_soft_reset,SRBM_SOFT_RESET ,SOFT_RESET_VCE0 ,1 );
@@ -588,6 +589,7 @@ static int vce_v3_0_check_soft_reset(void *handle) adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE ].hang = false; adev->vce.srbm_soft_reset =0 ; } +mutex_unlock (&adev->grbm_idx_mutex);return 0 ; }
Signature · 6 lines
2.9.2 _______________________________________________ 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]
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 2/4] drm/amd/amdgpu: add mutex in check_soft for VCE v3
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 2/4] drm/amd/amdgpu: add mutex incheck_softfor VCE v3Signed-off-by Tom St Denis <[email protected]>
Quoted 31 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-0@@ -569,6 +569,7 @@ static int vce_v3_0_check_soft_reset(void *handle)* * VCE team suggest use bit 3--bit 6 for busy status check */ +mutex_lock (&adev->grbm_idx_mutex);WREG32_FIELD (GRBM_GFX_INDEX ,INSTANCE_INDEX ,0 );if (RREG32 (mmVCE_STATUS) &AMDGPU_VCE_STATUS_BUSY_MASK ) {
srbm_soft_reset= REG_SET_FIELD(srbm_soft_reset,SRBM_SOFT_RESET,SOFT_RESET_VCE0, 1);drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1
-1@@ -588,6 +589,7 @@ static int vce_v3_0_check_soft_reset(void *handle) adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE ].hang = false; adev->vce.srbm_soft_reset =0 ; } +mutex_unlock (&adev->grbm_idx_mutex);return 0 ; } --2.9.2
Quoted 4 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
PATCH 3/4 drm/amd/amdgpu: VCE v2 register cleanup
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++---------------------- 1 file changed, 14 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +14 -25
@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , ~VCE_VCPU_CNTL__CLK_EN_MASK ); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i =0 ; i <10 ; ++i) {uint32_t status;
@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ;DRM_ERROR ("VCE not responding, trying to reset the ECPU!!!\n" ); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }
@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated)DRM_INFO ("VCE is busy, Can't set clock gateing" );return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK ); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { -WREG32_P (mmVCE_VCPU_CNTL,VCE_VCPU_CNTL__CLK_EN_MASK , ~VCE_VCPU_CNTL__CLK_EN_MASK ); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }
@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2, size);WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK ); +WREG32_FIELD (VCE_SYS_INT_EN ,VCE_SYS_INT_TRAP_INTERRUPT_EN ,1 );vce_v2_0_init_cg (adev); }
@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle) { -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) &SRBM_STATUS2__VCE_BUSY_MASK )) +if (vce_v2_0_is_idle (handle))return 0 ; }return -ETIMEDOUT ;
@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start (adev);
@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default : DRM_ERROR("Unhandled interrupt: %d %d\n",
Signature · 6 lines
2.9.2 _______________________________________________ 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]
RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupSigned-off-by Tom St Denis <[email protected]>
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching WREG32_P for WREG_FIELD other than code churn. They basically do the same thing.
Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3for (i =0 ; i <10 ; ++i) {uint32_t status;@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-1- WREG32_P(mmVCE_SOFT_RESET,
VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK,
~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0vce_v2_0_init_cg (adev); }@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;
This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2return -ETIMEDOUT ;@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3return vce_v2_0_start (adev);@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694FE8258E0ADB4F32DC885F71E0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Just trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);
Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);
(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
________________________________
From: Deucher, Alexander
Sent: Thursday, August 11, 2016 11:46
To: 'Tom St Denis'; [email protected]
Cc: StDenis, Tom
Subject: RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupSigned-off-by Tom St Denis <[email protected]>
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching WREG32_P for WREG_FIELD other than code churn. They basically do the same thing.
Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;
This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): DM5PR12MB1132A35D1BAAB0027D5FE23AF71E0-2J9CzHegvk+UzrhdoDeimQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
I guess I don't really have a particularly strong opinion either way. If others are ok with it, I'm fine with it.
Alex
From: StDenis, Tom
Sent: Thursday, August 11, 2016 11:48 AM
To: Deucher, Alexander; [email protected]
Subject: Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Just trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);
Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);
(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
________________________________
From: Deucher, Alexander
Sent: Thursday, August 11, 2016 11:46
To: 'Tom St Denis'; [email protected]<mailto:[email protected]>
Cc: StDenis, Tom
Subject: RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf
Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]<mailto:[email protected]>
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching WREG32_P for WREG_FIELD other than code churn. They basically do the same thing.
Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;
This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): MWHPR12MB1694A14EF7C0FAD8E46B5A97F71E0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Agree with Tom.
Quoted 192 lines · Alexander
I guess I don't really have a particularly strong opinion either way. If others are ok with it, I'm fine with it.
Alex
*From:*StDenis, Tom
*Sent:* Thursday, August 11, 2016 11:48 AM
*To:* Deucher, Alexander; [email protected] *Subject:* Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupJust trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
------------------------------------------------------------------------
*From:*Deucher, Alexander
*Sent:* Thursday, August 11, 2016 11:46
*To:* 'Tom St Denis'; [email protected] <mailto:[email protected]> *Cc:* StDenis, Tom
*Subject:* RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf
Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected] <mailto:[email protected]>
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupSigned-off-by Tom St Denis <[email protected]<mailto:[email protected]>>
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching
WREG32_PforWREG_FIELDother than code churn. They basically do the same thing.Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
amd-gfx mailing list
[email protected] <mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Dito, using WREG32_FIELD is clearly easier to read.
If the additional register writes are really an issue we could adjust the macro to skip those if the value didn't changed.
Regards,
Christian.
Am 12.08.2016 um 03:52 schrieb zhoucm1:
Quoted 204 lines
Agree with Tom.
Quoted 194 lines · Alexander
I guess I don't really have a particularly strong opinion either way. If others are ok with it, I'm fine with it.
Alex
*From:*StDenis, Tom
*Sent:* Thursday, August 11, 2016 11:48 AM
*To:* Deucher, Alexander; [email protected] *Subject:* Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupJust trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
------------------------------------------------------------------------
*From:*Deucher, Alexander
*Sent:* Thursday, August 11, 2016 11:46
*To:* 'Tom St Denis'; [email protected] <mailto:[email protected]> *Cc:* StDenis, Tom
*Subject:* RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupQuoted 5 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]<mailto:[email protected]>
Quoted 4 lines
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupSigned-off-by Tom St Denis <[email protected]<mailto:[email protected]>>
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching
WREG32_PforWREG_FIELDother than code churn. They basically do the same thing.Alex
Quoted 51 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-0+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static void vce_v2_0_set_dyn_cg(struct · line 340
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clockgateing");
Quoted 40 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-3return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
amd-gfx mailing list
[email protected] <mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfxQuoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 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
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
In reply to a message not in the archiveIn that case:
From: amd-gfx [mailto:[email protected]] On Behalf Of zhoucm1
Sent: Thursday, August 11, 2016 9:52 PM
To: Deucher, Alexander; StDenis, Tom; [email protected]
Subject: Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Agree with Tom.
On 2016年08月12日 00:09, Deucher, Alexander wrote:
I guess I don't really have a particularly strong opinion either way. If others are ok with it, I'm fine with it.
Alex
From: StDenis, Tom
Sent: Thursday, August 11, 2016 11:48 AM
To: Deucher, Alexander; [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Just trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);
Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);
(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
________________________________
From: Deucher, Alexander
Sent: Thursday, August 11, 2016 11:46
To: 'Tom St Denis'; [email protected]<mailto:[email protected]>
Cc: StDenis, Tom
Subject: RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]<mailto:[email protected]>
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching WREG32_P for WREG_FIELD other than code churn. They basically do the same thing.
Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;
This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :
Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): MWHPR12MB1694519FD1F5113FBA3EC20CF71F0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Quoted 1 line · Alexander
In that case:
For the series:
Quoted 249 lines
Reviewed-by Alex Deucher <[email protected]>From: amd-gfx [mailto:[email protected]] On Behalf Of zhoucm1
Sent: Thursday, August 11, 2016 9:52 PM
To: Deucher, Alexander; StDenis, Tom; [email protected]Subject: Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup
Agree with Tom.
On 2016年08月12日 00:09, Deucher, Alexander wrote:
I guess I don't really have a particularly strong opinion either way. If others are ok with it, I'm fine with it.
Alex
From: StDenis, Tom
Sent: Thursday, August 11, 2016 11:48 AM
To: Deucher, Alexander; [email protected]
Subject: Re: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupJust trying to make it easier to read.
WREG32_FIELD(foo, FIELD, 1);Is easier to read than
WREG32_P(foo, FOO__FIELD_MASK, ~FOO__FIELD_MASK);(also I already pushed them after getting a RB by Christian this morning so we might need to hold a different discussion).
I agree it's not really a functional change but making things a bit more uniform and easier to read helps maintenance. And I did find a bug in the process :-)
Tom
________________________________
From: Deucher, Alexander
Sent: Thursday, August 11, 2016 11:46
To: 'Tom St Denis'; [email protected]
Cc: StDenis, Tom
Subject: RE: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanupSigned-off-by Tom St Denis <[email protected]>A couple pieces of this patch could be split out as separate cleanups (see below). However, I'm not sure how much value there is in switching
WREG32_PforWREG_FIELDother than code churn. They basically do the same thing.Alex
Quoted 93 lines
--- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 39 +++++++++++++------------- --------- 1 file changed, 14 insertions(+), 25 deletions(-)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-8@@ -127,15 +127,10 @@ static int vce_v2_0_start(struct amdgpu_device *adev)WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); -WREG32_P (mmVCE_VCPU_CNTL, VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK); - -WREG32_P (mmVCE_SOFT_RESET, -VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); - +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); - -WREG32_P (mmVCE_SOFT_RESET,0 , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );for (i = 0; i < 10; ++i) { uint32_t status;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -150,10 +145,9 @@ static int vce_v2_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("VCE not responding, trying to reset the ECPU!!!\n"); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , - ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (10 ); - WREG32_P(mmVCE_SOFT_RESET, 0,~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -345,13 +339,13 @@ static void vce_v2_0_set_dyn_cg(struct amdgpu_device *adev, bool gated) DRM_INFO("VCE is busy, Can't set clock gateing");return ; } -WREG32_P (mmVCE_VCPU_CNTL,0 , ~VCE_VCPU_CNTL__CLK_EN_MASK); -WREG32_P (mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK , ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK); +WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,0 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 );WREG32 (mmVCE_STATUS,0 ); }else { - WREG32_P(mmVCE_VCPU_CNTL,
VCE_VCPU_CNTL__CLK_EN_MASK, ~VCE_VCPU_CNTL__CLK_EN_MASK);
- WREG32_P(mmVCE_SOFT_RESET,VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK, ~VCE_SOFT_RESET__ECPU_SOFT_RESET_MASK);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3
-3+WREG32_FIELD (VCE_VCPU_CNTL ,CLK_EN ,1 ); +WREG32_FIELD (VCE_SOFT_RESET ,ECPU_SOFT_RESET ,1 );mdelay (100 ); }@@ -458,9 +452,7 @@ static void vce_v2_0_mc_resume(struct amdgpu_device *adev)WREG32 (mmVCE_VCPU_CACHE_SIZE2 ,size );WREG32_P (mmVCE_LMI_CTRL2,0x0 , ~0x100 ); - -WREG32_P (mmVCE_SYS_INT_EN,VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK , - ~VCE_SYS_INT_EN__VCE_SYS_INT_TRAP_INTERRUPT_EN_MASK); + WREG32_FIELD(VCE_SYS_INT_EN,
VCE_SYS_INT_TRAP_INTERRUPT_EN, 1);vce_v2_0_init_cg(adev);}
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0@@ -474,11 +466,11 @@ static bool vce_v2_0_is_idle(void *handle)static int vce_v2_0_wait_for_idle (void *handle)drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static bool vce_v2_0_is_idle(void *handle) · line 475
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-2{ -unsigned i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +unsigned i;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS2) & SRBM_STATUS2__VCE_BUSY_MASK)) +if (vce_v2_0_is_idle (handle))return 0 ;This could be split out as a separate patch.
Quoted 25 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0}return -ETIMEDOUT;drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-2@@ -488,8 +480,7 @@ static int vce_v2_0_soft_reset(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK , - ~SRBM_SOFT_RESET__SOFT_RESET_VCE_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_VCE ,1 );mdelay (5 );return vce_v2_0_start(adev);drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-3@@ -516,10 +507,8 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev,DRM_DEBUG ("IH: VCE\n" );switch (entry->src_data) {case 0 : -amdgpu_fence_process (&adev->vce.ring[0 ]); -break ;case 1 : -amdgpu_fence_process (&adev->vce.ring[1 ]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data]);break ;default :Quoted 1 line
DRM_ERROR("Unhandled interrupt: %d %d\n",
This too.
Quoted 7 lines
--
2.9.2_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
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
PATCH 4/4 drm/amd/amdgpu: UVD v6 register cleanup
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +11 -16
@@ -397,15 +397,13 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)uvd_v6_0_mc_resume (adev);/* disable clock gating */ - tmp =RREG32 (mmUVD_CGC_CTRL); - tmp &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; -WREG32 (mmUVD_CGC_CTRL, tmp); +WREG32_FIELD (UVD_CGC_CTRL ,DYN_CLOCK_MODE ,0 );/* disable interupt */ -WREG32_P (mmUVD_MASTINT_EN,0 , ~UVD_MASTINT_EN__VCPU_EN_MASK ); +WREG32_FIELD (UVD_MASTINT_EN ,VCPU_EN ,0 );/* stall UMC and register bus before resetting VCPU */ -WREG32_P (mmUVD_LMI_CTRL2,UVD_LMI_CTRL2__STALL_ARB_UMC_MASK , ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ); +WREG32_FIELD (UVD_LMI_CTRL2 ,STALL_ARB_UMC ,1 );mdelay (1 );/* put LMI, VCPU, RBC etc... into reset */
@@ -421,7 +419,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)mdelay (5 );/* take UVD block out of reset */ -WREG32_P (mmSRBM_SOFT_RESET,0 , ~SRBM_SOFT_RESET__SOFT_RESET_UVD_MASK ); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_UVD ,0 );mdelay (5 );/* initialize UVD memory controller */
@@ -456,7 +454,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)WREG32 (mmUVD_VCPU_CNTL,UVD_VCPU_CNTL__CLK_EN_MASK );/* enable UMC */ -WREG32_P (mmUVD_LMI_CTRL2,0 , ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ); +WREG32_FIELD (UVD_LMI_CTRL2 ,STALL_ARB_UMC ,0 );/* boot up the VCPU */ WREG32 (mmUVD_SOFT_RESET,0 );
@@ -476,11 +474,9 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)break ;DRM_ERROR ("UVD not responding, trying to reset the VCPU!!!\n" ); -WREG32_P (mmUVD_SOFT_RESET,UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK , - ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_FIELD (UVD_SOFT_RESET ,VCPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmUVD_SOFT_RESET,0 , - ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_FIELD (UVD_SOFT_RESET ,VCPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }
@@ -497,15 +493,14 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)/* clear the bit 4 of UVD_STATUS */ WREG32_P (mmUVD_STATUS,0 , ~(2 <<UVD_STATUS__VCPU_REPORT__SHIFT )); +/* force RBC into idle state */ rb_bufsz =order_base_2 (ring->ring_size); - tmp =0 ; - tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_BUFSZ , rb_bufsz); + 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_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 ); -/* force RBC into idle state */ WREG32 (mmUVD_RBC_RB_CNTL, tmp);/* set the write pointer delay */
@@ -526,7 +521,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev) ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR);WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); -WREG32_P (mmUVD_RBC_RB_CNTL,0 , ~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK ); +WREG32_FIELD (UVD_RBC_RB_CNTL ,RB_NO_FETCH ,0 );return 0 ; }
@@ -743,7 +738,7 @@ static int uvd_v6_0_wait_for_idle(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS) &SRBM_STATUS__UVD_BUSY_MASK )) +if (uvd_v6_0_is_idle (handle))return 0 ; }return -ETIMEDOUT ;
Signature · 6 lines
2.9.2 _______________________________________________ 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]
RE: [PATCH 4/4] drm/amd/amdgpu: UVD v6 register cleanup
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Thursday, August 11, 2016 10:33 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 4/4] drm/amd/amdgpu: UVD v6 register cleanupSigned-off-by Tom St Denis <[email protected]>
Same comment as the previous patch.
Quoted 109 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +2
-5@@ -397,15 +397,13 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)uvd_v6_0_mc_resume (adev);/* disable clock gating */ - tmp =RREG32 (mmUVD_CGC_CTRL); - tmp &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; -WREG32 (mmUVD_CGC_CTRL, tmp); +WREG32_FIELD (UVD_CGC_CTRL ,DYN_CLOCK_MODE ,0 );/* disable interupt */ -WREG32_P (mmUVD_MASTINT_EN,0 , ~UVD_MASTINT_EN__VCPU_EN_MASK); +WREG32_FIELD (UVD_MASTINT_EN ,VCPU_EN ,0 );/* stall UMC and register bus before resetting VCPU */ - WREG32_P(mmUVD_LMI_CTRL2, UVD_LMI_CTRL2__STALL_ARB_UMC_MASK,~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK);
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +2
-1+WREG32_FIELD (UVD_LMI_CTRL2 ,STALL_ARB_UMC ,1 );mdelay (1 );/* put LMI, VCPU, RBC etc... into reset */ @@ -421,7 +419,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)mdelay (5 );/* take UVD block out of reset */ -WREG32_P (mmSRBM_SOFT_RESET,0 , ~SRBM_SOFT_RESET__SOFT_RESET_UVD_MASK); +WREG32_FIELD (SRBM_SOFT_RESET ,SOFT_RESET_UVD ,0 );mdelay (5 );drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1
-1/* initialize UVD memory controller */ @@ -456,7 +454,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)WREG32 (mmUVD_VCPU_CNTL,UVD_VCPU_CNTL__CLK_EN_MASK );/* enable UMC */ -WREG32_P (mmUVD_LMI_CTRL2,0 , ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK); +WREG32_FIELD (UVD_LMI_CTRL2 ,STALL_ARB_UMC ,0 );drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +4
-6/* boot up the VCPU */ WREG32 (mmUVD_SOFT_RESET,0 );@@ -476,11 +474,9 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)break ; DRM_ERROR("UVD not responding, trying to reset the VCPU!!!\n"); -WREG32_P (mmUVD_SOFT_RESET,UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK , - ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_FIELD (UVD_SOFT_RESET ,VCPU_SOFT_RESET ,1 );mdelay (10 ); -WREG32_P (mmUVD_SOFT_RESET,0 , - ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +WREG32_FIELD (UVD_SOFT_RESET ,VCPU_SOFT_RESET ,0 );mdelay (10 ); r =-1 ; }@@ -497,15 +493,14 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)/* clear the bit 4 of UVD_STATUS */ WREG32_P (mmUVD_STATUS,0 , ~(2 <<UVD_STATUS__VCPU_REPORT__SHIFT )); +/* force RBC into idle state */ rb_bufsz =order_base_2 (ring->ring_size); - tmp =0 ; - tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_BUFSZ , rb_bufsz); + 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_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);drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1
-2-/* force RBC into idle state */ WREG32 (mmUVD_RBC_RB_CNTL, tmp);/* set the write pointer delay */ @@ -526,7 +521,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev) ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR);WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); -WREG32_P (mmUVD_RBC_RB_CNTL,0 , ~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK); +WREG32_FIELD (UVD_RBC_RB_CNTL ,RB_NO_FETCH ,0 );drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-0return 0 ; }
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static int uvd_v6_0_wait_for_idle(void *handle) · line 743
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1
-1@@ -743,7 +738,7 @@ static int uvd_v6_0_wait_for_idle(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->usec_timeout; i++) { -if (!(RREG32 (mmSRBM_STATUS) & SRBM_STATUS__UVD_BUSY_MASK)) +if (uvd_v6_0_is_idle (handle))return 0 ;
This could be split out as a separate patch.
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-0}return
-ETIMEDOUT;
--
2.9.2_______________________________________________
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