drm/amdgpu: fix transform feedback GDS hang on gfx10
Subsystems (2)
PATCH 1/2 drm/amdgpu: fix transform feedback GDS hang on gfx10
From: Marek Olšák <[email protected]>
Signed-off-by Marek Olšák <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h +2 -1
@@ -24,21 +24,22 @@#ifndef __AMDGPU_GDS_H__#define __AMDGPU_GDS_H__struct amdgpu_ring ;struct amdgpu_bo ;struct amdgpu_gds {uint32_t gds_size;uint32_t gws_size;uint32_t oa_size; -uint32_t gds_compute_max_wave_id; +uint32_t gds_compute_max_wave_id; +uint32_t vgt_gs_max_wave_id; };struct amdgpu_gds_reg_offset {uint32_t mem_base;uint32_t mem_size;uint32_t gws;uint32_t oa; };#endif /* __AMDGPU_GDS_H__ */
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +10 -2
@@ -4213,20 +4213,29 @@ static void gfx_v10_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) }static void gfx_v10_0_ring_emit_ib_gfx (struct amdgpu_ring *ring,struct amdgpu_job *job,struct amdgpu_ib *ib,uint32_t flags) {unsigned vmid =AMDGPU_JOB_GET_VMID (job);u32 header, control =0 ; +/* Prevent a hw deadlock due to a wave ID mismatch between ME and GDS. +* This resets the wave ID counters. (needed by transform feedback) +* TODO: This might only be needed on a VMID switch when we change +* the GDS OA mapping, not sure. +*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_SET_CONFIG_REG ,1 )); +amdgpu_ring_write (ring, mmVGT_GS_MAX_WAVE_ID); +amdgpu_ring_write (ring, ring->adev->gds.vgt_gs_max_wave_id); +if (ib->flags &AMDGPU_IB_FLAG_CE ) header =PACKET3 (PACKET3_INDIRECT_BUFFER_CNST ,2 );else header =PACKET3 (PACKET3_INDIRECT_BUFFER ,2 ); control |= ib->length_dw | (vmid <<24 );if (amdgpu_mcbp && (ib->flags &AMDGPU_IB_FLAG_PREEMPT )) { control |=INDIRECT_BUFFER_PRE_ENB (1 );
@@ -5094,24 +5103,23 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev)default :break ; } }static void gfx_v10_0_set_gds_init (struct amdgpu_device *adev) {/* init asic gds info */ switch (adev->asic_type) {case CHIP_NAVI10 : - adev->gds.gds_size =0x10000 ; -break ;default : adev->gds.gds_size =0x10000 ; + adev->gds.vgt_gs_max_wave_id =0x3ff ;break ; } adev->gds.gws_size =64 ; adev->gds.oa_size =16 ; }static void gfx_v10_0_set_user_wgp_inactive_bitmap_per_sh (struct amdgpu_device *adev,u32 bitmap) {
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20190620000216.14272-1-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/2 drm/amdgpu: handle AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID on gfx10
From: Marek Olšák <[email protected]>
Signed-off-by Marek Olšák <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +17 -0
@@ -4259,20 +4259,36 @@ static void gfx_v10_0_ring_emit_ib_gfx(struct amdgpu_ring *ring, }static void gfx_v10_0_ring_emit_ib_compute (struct amdgpu_ring *ring,struct amdgpu_job *job,struct amdgpu_ib *ib,uint32_t flags) {unsigned vmid =AMDGPU_JOB_GET_VMID (job);u32 control =INDIRECT_BUFFER_VALID | ib->length_dw | (vmid <<24 ); +/* Currently, there is a high possibility to get wave ID mismatch +* between ME and GDS, leading to a hw deadlock, because ME generates +* different wave IDs than the GDS expects. This situation happens +* randomly when at least 5 compute pipes use GDS ordered append. +* The wave IDs generated by ME are also wrong after suspend/resume. +* Those are probably bugs somewhere else in the kernel driver. +* +* Writing GDS_COMPUTE_MAX_WAVE_ID resets wave ID counters in ME and +* GDS to 0 for this ring (me/pipe). +*/ +if (ib->flags &AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID ) { +amdgpu_ring_write (ring,PACKET3 (PACKET3_SET_CONFIG_REG ,1 )); +amdgpu_ring_write (ring, mmGDS_COMPUTE_MAX_WAVE_ID); +amdgpu_ring_write (ring, ring->adev->gds.gds_compute_max_wave_id); + } +amdgpu_ring_write (ring,PACKET3 (PACKET3_INDIRECT_BUFFER ,2 ));BUG_ON (ib->gpu_addr &0x3 );/* Dword align */ amdgpu_ring_write (ring, #ifdef __BIG_ENDIAN (2 <<0 ) | #endiflower_32_bits (ib->gpu_addr));amdgpu_ring_write (ring,upper_32_bits (ib->gpu_addr));amdgpu_ring_write (ring, control); }
@@ -5105,20 +5121,21 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev) } }static void gfx_v10_0_set_gds_init (struct amdgpu_device *adev) {/* init asic gds info */ switch (adev->asic_type) {case CHIP_NAVI10 :default : adev->gds.gds_size =0x10000 ; + adev->gds.gds_compute_max_wave_id =0x4ff ; adev->gds.vgt_gs_max_wave_id =0x3ff ;break ; } adev->gds.gws_size =64 ; adev->gds.oa_size =16 ; }static void gfx_v10_0_set_user_wgp_inactive_bitmap_per_sh (struct amdgpu_device *adev,u32 bitmap)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
please take care of .emit_ib_size member, otherwise it looks ok to me.
-David
Quoted 86 lines · Marek Olšák
From: Marek Olšák <[email protected]>
Signed-off-by Marek Olšák <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h +2
-1@@ -24,21 +24,22 @@#ifndef __AMDGPU_GDS_H__#define __AMDGPU_GDS_H__struct amdgpu_ring ;struct amdgpu_bo ;struct amdgpu_gds {uint32_t gds_size;uint32_t gws_size;uint32_t oa_size; -uint32_t gds_compute_max_wave_id; +uint32_t gds_compute_max_wave_id; +uint32_t vgt_gs_max_wave_id; };struct amdgpu_gds_reg_offset {uint32_t mem_base;uint32_t mem_size;uint32_t gws;uint32_t oa; };#endif /* __AMDGPU_GDS_H__ */ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +10
-2@@ -4213,20 +4213,29 @@ static void gfx_v10_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) }static void gfx_v10_0_ring_emit_ib_gfx (struct amdgpu_ring *ring,struct amdgpu_job *job,struct amdgpu_ib *ib,uint32_t flags) {unsigned vmid =AMDGPU_JOB_GET_VMID (job);u32 header, control =0 ; +/* Prevent a hw deadlock due to a wave ID mismatch between ME and GDS. +* This resets the wave ID counters. (needed by transform feedback) +* TODO: This might only be needed on a VMID switch when we change +* the GDS OA mapping, not sure. +*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_SET_CONFIG_REG ,1 )); +amdgpu_ring_write (ring, mmVGT_GS_MAX_WAVE_ID); +amdgpu_ring_write (ring, ring->adev->gds.vgt_gs_max_wave_id); +if (ib->flags &AMDGPU_IB_FLAG_CE ) header =PACKET3 (PACKET3_INDIRECT_BUFFER_CNST ,2 );else header =PACKET3 (PACKET3_INDIRECT_BUFFER ,2 ); control |= ib->length_dw | (vmid <<24 );if (amdgpu_mcbp && (ib->flags &AMDGPU_IB_FLAG_PREEMPT )) { control |=INDIRECT_BUFFER_PRE_ENB (1 );@@ -5094,24 +5103,23 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev)default :break ; } }static void gfx_v10_0_set_gds_init (struct amdgpu_device *adev) {/* init asic gds info */ switch (adev->asic_type) {case CHIP_NAVI10 : - adev->gds.gds_size =0x10000 ; -break ;default : adev->gds.gds_size =0x10000 ; + adev->gds.vgt_gs_max_wave_id =0x3ff ;
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev) · line 5125
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0
-0break ; } adev->gds.gws_size =64 ; adev->gds.oa_size =16 ; }static void gfx_v10_0_set_user_wgp_inactive_bitmap_per_sh (struct amdgpu_device *adev,u32 bitmap) {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx