drm/amdgpu/gfx10: properly handle error ints on all pipes
Subsystems (2)
Alex Deucher
maintainerPATCH 1/3 drm/amdgpu/gfx10: properly handle error ints on all pipes
Need to handle the interrupt enables for all pipes.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 130 +++++++++++++++++++++---- 1 file changed, 109 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +109 -21
@@ -5269,26 +5269,74 @@ static void gfx_v10_0_constants_init(struct amdgpu_device *adev) } +static u32 gfx_v10_0_get_cpg_int_cntl (struct amdgpu_device *adev, +int me,int pipe) +{ +if (me !=0 ) +return 0 ; + +switch (pipe) { +case 0 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_INT_CNTL_RING0); +case 1 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_INT_CNTL_RING1); +default : +return 0 ; + } +} + +static u32 gfx_v10_0_get_cpc_int_cntl (struct amdgpu_device *adev, +int me,int pipe) +{ +/* +* amdgpu controls only the first MEC. That's why this function only +* handles the setting of interrupts for this specific MEC. All other +* pipes' interrupts are set by amdkfd. +*/ +if (me !=1 ) +return 0 ; + +switch (pipe) { +case 0 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_ME1_PIPE0_INT_CNTL); +case 1 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_ME1_PIPE1_INT_CNTL); +case 2 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_ME1_PIPE2_INT_CNTL); +case 3 : +return SOC15_REG_OFFSET (GC ,0 , mmCP_ME1_PIPE3_INT_CNTL); +default : +return 0 ; + } +} +static void gfx_v10_0_enable_gui_idle_interrupt (struct amdgpu_device *adev,bool enable) { -u32 tmp; +u32 tmp, cp_int_cntl_reg; +int i, j;if (amdgpu_sriov_vf (adev))return ; - tmp =RREG32_SOC15 (GC ,0 , mmCP_INT_CNTL_RING0); - - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_BUSY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_EMPTY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CMP_BUSY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,GFX_IDLE_INT_ENABLE , - enable ?1 :0 ); - -WREG32_SOC15 (GC ,0 , mmCP_INT_CNTL_RING0, tmp); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v10_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + tmp =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_BUSY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_EMPTY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CMP_BUSY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,GFX_IDLE_INT_ENABLE , + enable ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, tmp); + } + } + } }static int gfx_v10_0_init_csb (struct amdgpu_device *adev)
@@ -9134,12 +9182,39 @@ static int gfx_v10_0_set_priv_reg_fault_state(struct amdgpu_device *adev,unsigned int type, enum amdgpu_interrupt_state state) { + u32 cp_int_cntl_reg, cp_int_cntl; +int i, j; +switch (state) {case AMDGPU_IRQ_STATE_DISABLE :case AMDGPU_IRQ_STATE_ENABLE : - WREG32_FIELD15(GC, 0, CP_INT_CNTL_RING0, -PRIV_REG_INT_ENABLE , - state == AMDGPU_IRQ_STATE_ENABLE ? 1 : 0); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v10_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_INT_CNTL_RING0 , +PRIV_REG_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + } +for (i =0 ; i < adev->gfx.mec.num_mec; i++) { +for (i =0 ; i < adev->gfx.mec.num_pipe_per_mec; i++) { +/* MECs start at 1 */ + cp_int_cntl_reg =gfx_v10_0_get_cpc_int_cntl (adev, i +1 , j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_ME1_PIPE0_INT_CNTL , +PRIV_REG_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + }break ;default :break ;
@@ -9153,12 +9228,25 @@ static int gfx_v10_0_set_priv_inst_fault_state(struct amdgpu_device *adev,unsigned int type, enum amdgpu_interrupt_state state) { + u32 cp_int_cntl_reg, cp_int_cntl; +int i, j; +switch (state) {case AMDGPU_IRQ_STATE_DISABLE :case AMDGPU_IRQ_STATE_ENABLE : - WREG32_FIELD15(GC, 0, CP_INT_CNTL_RING0, -PRIV_INSTR_INT_ENABLE , - state == AMDGPU_IRQ_STATE_ENABLE ? 1 : 0); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v10_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_INT_CNTL_RING0 , +PRIV_INSTR_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + }break ;default :break ;
@@ -9182,8 +9270,8 @@ static void gfx_v10_0_handle_priv_fault(struct amdgpu_device *adev,case 0 :for (i =0 ; i < adev->gfx.num_gfx_rings; i++) { ring = &adev->gfx.gfx_ring[i]; -/* we only enabled 1 gfx queue per pipe for now */ -if (ring->me == me_id && ring->pipe == pipe_id) +if (ring->me == me_id && ring->pipe == pipe_id && + ring->queue == queue_id)drm_sched_fault (&ring->sched); }break ;
Signature · 1 line
2.45.2
Alex Deucher
maintainerPATCH 2/3 drm/amdgpu/gfx11: properly handle error ints on all pipes
Need to handle the interrupt enables for all pipes.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 134 ++++++++++++++++++++----- 1 file changed, 111 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +111 -23
@@ -1947,26 +1947,74 @@ static void gfx_v11_0_constants_init(struct amdgpu_device *adev)gfx_v11_0_init_gds_vmid (adev); } +static u32 gfx_v11_0_get_cpg_int_cntl (struct amdgpu_device *adev, +int me,int pipe) +{ +if (me !=0 ) +return 0 ; + +switch (pipe) { +case 0 : +return SOC15_REG_OFFSET (GC ,0 , regCP_INT_CNTL_RING0); +case 1 : +return SOC15_REG_OFFSET (GC ,0 , regCP_INT_CNTL_RING1); +default : +return 0 ; + } +} + +static u32 gfx_v11_0_get_cpc_int_cntl (struct amdgpu_device *adev, +int me,int pipe) +{ +/* +* amdgpu controls only the first MEC. That's why this function only +* handles the setting of interrupts for this specific MEC. All other +* pipes' interrupts are set by amdkfd. +*/ +if (me !=1 ) +return 0 ; + +switch (pipe) { +case 0 : +return SOC15_REG_OFFSET (GC ,0 , regCP_ME1_PIPE0_INT_CNTL); +case 1 : +return SOC15_REG_OFFSET (GC ,0 , regCP_ME1_PIPE1_INT_CNTL); +case 2 : +return SOC15_REG_OFFSET (GC ,0 , regCP_ME1_PIPE2_INT_CNTL); +case 3 : +return SOC15_REG_OFFSET (GC ,0 , regCP_ME1_PIPE3_INT_CNTL); +default : +return 0 ; + } +} +static void gfx_v11_0_enable_gui_idle_interrupt (struct amdgpu_device *adev,bool enable) { -u32 tmp; +u32 tmp, cp_int_cntl_reg; +int i, j;if (amdgpu_sriov_vf (adev))return ; - tmp =RREG32_SOC15 (GC ,0 , regCP_INT_CNTL_RING0); - - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_BUSY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_EMPTY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CMP_BUSY_INT_ENABLE , - enable ?1 :0 ); - tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,GFX_IDLE_INT_ENABLE , - enable ?1 :0 ); - -WREG32_SOC15 (GC ,0 , regCP_INT_CNTL_RING0, tmp); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v11_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + tmp =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_BUSY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CNTX_EMPTY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,CMP_BUSY_INT_ENABLE , + enable ?1 :0 ); + tmp =REG_SET_FIELD (tmp,CP_INT_CNTL_RING0 ,GFX_IDLE_INT_ENABLE , + enable ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, tmp); + } + } + } }static int gfx_v11_0_init_csb (struct amdgpu_device *adev)
@@ -6199,15 +6247,42 @@ static int gfx_v11_0_eop_irq(struct amdgpu_device *adev,static int gfx_v11_0_set_priv_reg_fault_state (struct amdgpu_device *adev,struct amdgpu_irq_src *source, -unsigned type, +unsigned int type,enum amdgpu_interrupt_state state) { +u32 cp_int_cntl_reg, cp_int_cntl; +int i, j; +switch (state) {case AMDGPU_IRQ_STATE_DISABLE :case AMDGPU_IRQ_STATE_ENABLE : -WREG32_FIELD15_PREREG (GC ,0 ,CP_INT_CNTL_RING0 , -PRIV_REG_INT_ENABLE , - state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v11_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_INT_CNTL_RING0 , +PRIV_REG_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + } +for (i =0 ; i < adev->gfx.mec.num_mec; i++) { +for (i =0 ; i < adev->gfx.mec.num_pipe_per_mec; i++) { +/* MECs start at 1 */ + cp_int_cntl_reg =gfx_v11_0_get_cpc_int_cntl (adev, i +1 , j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_ME1_PIPE0_INT_CNTL , +PRIV_REG_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + }break ;default :break ;
@@ -6218,15 +6293,28 @@ static int gfx_v11_0_set_priv_reg_fault_state(struct amdgpu_device *adev,static int gfx_v11_0_set_priv_inst_fault_state (struct amdgpu_device *adev,struct amdgpu_irq_src *source, -unsigned type, +unsigned int type,enum amdgpu_interrupt_state state) { +u32 cp_int_cntl_reg, cp_int_cntl; +int i, j; +switch (state) {case AMDGPU_IRQ_STATE_DISABLE :case AMDGPU_IRQ_STATE_ENABLE : -WREG32_FIELD15_PREREG (GC ,0 ,CP_INT_CNTL_RING0 , -PRIV_INSTR_INT_ENABLE , - state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +for (i =0 ; i < adev->gfx.me.num_me; i++) { +for (i =0 ; i < adev->gfx.me.num_pipe_per_me; i++) { + cp_int_cntl_reg =gfx_v11_0_get_cpg_int_cntl (adev, i, j); + +if (cp_int_cntl_reg) { + cp_int_cntl =RREG32_SOC15_IP (GC , cp_int_cntl_reg); + cp_int_cntl =REG_SET_FIELD (cp_int_cntl,CP_INT_CNTL_RING0 , +PRIV_INSTR_INT_ENABLE , + state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); +WREG32_SOC15_IP (GC , cp_int_cntl_reg, cp_int_cntl); + } + } + }break ;default :break ;
@@ -6250,8 +6338,8 @@ static void gfx_v11_0_handle_priv_fault(struct amdgpu_device *adev,case 0 :for (i =0 ; i < adev->gfx.num_gfx_rings; i++) { ring = &adev->gfx.gfx_ring[i]; -/* we only enabled 1 gfx queue per pipe for now */ -if (ring->me == me_id && ring->pipe == pipe_id) +if (ring->me == me_id && ring->pipe == pipe_id && + ring->queue == queue_id)drm_sched_fault (&ring->sched); }break ;
Signature · 1 line
2.45.2
Alex Deucher
maintainerPATCH 3/3 Reapply "drm/amdgpu/gfx11: enable gfx pipe1 hardware support"
In reply to Alex DeucherThis reverts commit 28ebbdd7677d84d6d25ccff40ea6e9f01c2c8c7d.
Let's see if this works with the gfx pipe1 interrupts fixed.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +3 -3
@@ -50,7 +50,7 @@#include "nbio_v4_3.h" #include "mes_v11_0.h" -#define GFX11_NUM_GFX_RINGS 1 +#define GFX11_NUM_GFX_RINGS 2#define GFX11_MEC_HPD_SIZE 2048#define RLCG_UCODE_LOADING_START_ADDRESS 0x00002000L
@@ -1524,7 +1524,7 @@ static int gfx_v11_0_sw_init(void *handle)case IP_VERSION (11 ,0 ,2 ):case IP_VERSION (11 ,0 ,3 ): adev->gfx.me.num_me =1 ; - adev->gfx.me.num_pipe_per_me =1 ; + adev->gfx.me.num_pipe_per_me =2 ; adev->gfx.me.num_queue_per_pipe =1 ; adev->gfx.mec.num_mec =2 ; adev->gfx.mec.num_pipe_per_mec =4 ;
@@ -1535,7 +1535,7 @@ static int gfx_v11_0_sw_init(void *handle)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,5 ,1 ): adev->gfx.me.num_me =1 ; - adev->gfx.me.num_pipe_per_me =1 ; + adev->gfx.me.num_pipe_per_me =2 ; adev->gfx.me.num_queue_per_pipe =1 ; adev->gfx.mec.num_mec =1 ; adev->gfx.mec.num_pipe_per_mec =4 ;
Signature · 1 line
2.45.2