drm/amdgpu: Correct the irq types' num of sdma
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: Correct the irq types' num of sdma
Fix the issue about TDR-2 will have "fallback timer expired on ring sdma1". It is because the wrong number of irq types setting.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 ++----- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 25 ++++++++++++------------- drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 ++++---- 6 files changed, 30 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +2 -5
@@ -28,11 +28,8 @@#define AMDGPU_MAX_SDMA_INSTANCES 2enum amdgpu_sdma_irq { -AMDGPU_SDMA_IRQ_TRAP0 =0 , -AMDGPU_SDMA_IRQ_TRAP1 , -AMDGPU_SDMA_IRQ_ECC0 , -AMDGPU_SDMA_IRQ_ECC1 , - +AMDGPU_SDMA_IRQ_INSTANCE0 =0 , +AMDGPU_SDMA_IRQ_INSTANCE1 ,AMDGPU_SDMA_IRQ_LAST };
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +4 -4
@@ -977,8 +977,8 @@ static int cik_sdma_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }
@@ -1114,7 +1114,7 @@ static int cik_sdma_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );
@@ -1130,7 +1130,7 @@ static int cik_sdma_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +4 -4
@@ -870,8 +870,8 @@ static int sdma_v2_4_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }
@@ -1006,7 +1006,7 @@ static int sdma_v2_4_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );
@@ -1022,7 +1022,7 @@ static int sdma_v2_4_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +4 -4
@@ -1154,8 +1154,8 @@ static int sdma_v3_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }
@@ -1340,7 +1340,7 @@ static int sdma_v3_0_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );
@@ -1356,7 +1356,7 @@ static int sdma_v3_0_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +12 -13
@@ -1551,13 +1551,13 @@ static int sdma_v4_0_late_init(void *handle)if (r) goto sysfs; resume: - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); + r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 );if (r) goto irq; - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC1 ); + r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 );if (r) { -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); goto irq; }
@@ -1621,8 +1621,8 @@ static int sdma_v4_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r;
@@ -1641,8 +1641,8 @@ static int sdma_v4_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }
@@ -1709,8 +1709,8 @@ static int sdma_v4_0_hw_fini(void *handle)if (amdgpu_sriov_vf (adev))return 0 ; -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC1 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 );sdma_v4_0_ctx_switch_enable (adev, false);sdma_v4_0_enable (adev, false);
@@ -1780,13 +1780,12 @@ static int sdma_v4_0_set_trap_irq_state(struct amdgpu_device *adev,unsigned type, enum amdgpu_interrupt_state state) { - unsigned int instance = (type == AMDGPU_SDMA_IRQ_TRAP0) ? 0 : 1; u32 sdma_cntl; - sdma_cntl =RREG32_SDMA (instance, mmSDMA0_CNTL); + sdma_cntl =RREG32_SDMA (type, mmSDMA0_CNTL); sdma_cntl =REG_SET_FIELD (sdma_cntl,SDMA0_CNTL ,TRAP_ENABLE , state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); -WREG32_SDMA (instance, mmSDMA0_CNTL, sdma_cntl); +WREG32_SDMA (type, mmSDMA0_CNTL, sdma_cntl);return 0 ; }
@@ -1908,7 +1907,7 @@ static int sdma_v4_0_set_ecc_irq_state(struct amdgpu_device *adev, {u32 sdma_edc_config; -u32 reg_offset = (type ==AMDGPU_SDMA_IRQ_ECC0 ) ? +u32 reg_offset = (type ==AMDGPU_SDMA_IRQ_INSTANCE0 ) ?sdma_v4_0_get_reg_offset (adev,0 , mmSDMA0_EDC_CONFIG) :sdma_v4_0_get_reg_offset (adev,1 , mmSDMA0_EDC_CONFIG);
drivers/gpu/drm/amd/amdgpu/si_dma.c +4 -4
@@ -503,8 +503,8 @@ static int si_dma_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }
@@ -591,7 +591,7 @@ static int si_dma_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (DMA_CNTL +DMA0_REGISTER_OFFSET );
@@ -607,7 +607,7 @@ static int si_dma_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (DMA_CNTL +DMA1_REGISTER_OFFSET );
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1553752309-18396-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 28.03.19 um 06:51 schrieb Emily Deng:
Quoted 4 lines
Fix the issue about TDR-2 will have "fallback timer expired on ring sdma1". It is because the wrong number of irq types setting.
Signed-off-by Emily Deng <[email protected]>
Quoted 230 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 ++----- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 25 ++++++++++++------------- drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 ++++---- 6 files changed, 30 insertions(+), 34 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +2
-5@@ -28,11 +28,8 @@#define AMDGPU_MAX_SDMA_INSTANCES 2enum amdgpu_sdma_irq { -AMDGPU_SDMA_IRQ_TRAP0 =0 , -AMDGPU_SDMA_IRQ_TRAP1 , -AMDGPU_SDMA_IRQ_ECC0 , -AMDGPU_SDMA_IRQ_ECC1 , - +AMDGPU_SDMA_IRQ_INSTANCE0 =0 , +AMDGPU_SDMA_IRQ_INSTANCE1 ,AMDGPU_SDMA_IRQ_LAST };drivers/gpu/drm/amd/amdgpu/cik_sdma.c +4
-4@@ -977,8 +977,8 @@ static int cik_sdma_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }@@ -1114,7 +1114,7 @@ static int cik_sdma_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );@@ -1130,7 +1130,7 @@ static int cik_sdma_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +4
-4@@ -870,8 +870,8 @@ static int sdma_v2_4_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }@@ -1006,7 +1006,7 @@ static int sdma_v2_4_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );@@ -1022,7 +1022,7 @@ static int sdma_v2_4_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +4
-4@@ -1154,8 +1154,8 @@ static int sdma_v3_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }@@ -1340,7 +1340,7 @@ static int sdma_v3_0_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA0_REGISTER_OFFSET );@@ -1356,7 +1356,7 @@ static int sdma_v3_0_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (mmSDMA0_CNTL +SDMA1_REGISTER_OFFSET );drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +12
-13@@ -1551,13 +1551,13 @@ static int sdma_v4_0_late_init(void *handle)if (r) goto sysfs; resume: - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); + r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 );if (r) goto irq; - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC1 ); + r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 );if (r) { -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); goto irq; }@@ -1621,8 +1621,8 @@ static int sdma_v4_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r;@@ -1641,8 +1641,8 @@ static int sdma_v4_0_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }@@ -1709,8 +1709,8 @@ static int sdma_v4_0_hw_fini(void *handle)if (amdgpu_sriov_vf (adev))return 0 ; -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC0 ); -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_ECC1 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); +amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 );sdma_v4_0_ctx_switch_enable (adev, false);sdma_v4_0_enable (adev, false);@@ -1780,13 +1780,12 @@ static int sdma_v4_0_set_trap_irq_state(struct amdgpu_device *adev,unsigned type, enum amdgpu_interrupt_state state) { - unsigned int instance = (type == AMDGPU_SDMA_IRQ_TRAP0) ? 0 : 1; u32 sdma_cntl; - sdma_cntl =RREG32_SDMA (instance, mmSDMA0_CNTL); + sdma_cntl =RREG32_SDMA (type, mmSDMA0_CNTL); sdma_cntl =REG_SET_FIELD (sdma_cntl,SDMA0_CNTL ,TRAP_ENABLE , state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); -WREG32_SDMA (instance, mmSDMA0_CNTL, sdma_cntl); +WREG32_SDMA (type, mmSDMA0_CNTL, sdma_cntl);return 0 ; }@@ -1908,7 +1907,7 @@ static int sdma_v4_0_set_ecc_irq_state(struct amdgpu_device *adev, {u32 sdma_edc_config; -u32 reg_offset = (type ==AMDGPU_SDMA_IRQ_ECC0 ) ? +u32 reg_offset = (type ==AMDGPU_SDMA_IRQ_INSTANCE0 ) ?sdma_v4_0_get_reg_offset (adev,0 , mmSDMA0_EDC_CONFIG) :sdma_v4_0_get_reg_offset (adev,1 , mmSDMA0_EDC_CONFIG);drivers/gpu/drm/amd/amdgpu/si_dma.c +3
-3@@ -503,8 +503,8 @@ static int si_dma_sw_init(void *handle) r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, (i ==0 ) ? -AMDGPU_SDMA_IRQ_TRAP0 : -AMDGPU_SDMA_IRQ_TRAP1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 : +AMDGPU_SDMA_IRQ_INSTANCE1 );if (r)return r; }@@ -591,7 +591,7 @@ static int si_dma_set_trap_irq_state(struct amdgpu_device *adev,u32 sdma_cntl;switch (type) { -case AMDGPU_SDMA_IRQ_TRAP0 : +case AMDGPU_SDMA_IRQ_INSTANCE0 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (DMA_CNTL +DMA0_REGISTER_OFFSET );
drivers/gpu/drm/amd/amdgpu/si_dma.c static int si_dma_set_trap_irq_state(struct amdgpu_device *adev, · line 613
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dma.c +1
-1@@ -607,7 +607,7 @@ static int si_dma_set_trap_irq_state(struct amdgpu_device *adev,break ; }break ; -case AMDGPU_SDMA_IRQ_TRAP1 : +case AMDGPU_SDMA_IRQ_INSTANCE1 :switch (state) {case AMDGPU_IRQ_STATE_DISABLE : sdma_cntl =RREG32 (DMA_CNTL +DMA1_REGISTER_OFFSET );
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx