drm/amdgpu/gfx_v11_0: fix GFX11 MEC pipe reset ordering
Subsystems (2)
PATCH v2 1/5 drm/amdgpu/gfx_v11_0: fix GFX11 MEC pipe reset ordering
Hold MEC pipe reset asserted, walk every queue on that (me, pipe) and tear down CP_HQD_ACTIVE / CP_HQD_DEQUEUE_REQUEST via gfx_v11_0_clear_hqds_on_mec_pipe(), then deassert reset. Avoids releasing pipe reset while HQDs may still be active.
Legacy (non-RS64) path: read CP_MEC_CNTL for the reset mask instead of reusing CP_MEC_RS64_CNTL state.
V2:stop the schedulers for all queues on the pipe and then mark the fences with an error and then make sure to re-enable and test all of the queues after the reset (Alex)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 133 ++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 ++ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 157 +++++++++++++++--------- 3 files changed, 243 insertions(+), 58 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +133 -0
@@ -69,6 +69,139 @@ void amdgpu_queue_mask_bit_to_mec_queue(struct amdgpu_device *adev, int bit, } +static bool amdgpu_gfx_ring_on_mec_pipe (struct amdgpu_ring *ring,u32 me,u32 pipe) +{ +if (!ring || !ring->funcs || ring->funcs->type !=AMDGPU_RING_TYPE_COMPUTE ) +return false; +if (ring->no_scheduler) +return false; + +return ring->me == me && ring->pipe == pipe; +} + +/* Same layout as amdgpu_gfx_run_cleaner_shader(): block of num_compute_rings per XCC. */ +static unsigned int amdgpu_gfx_mec_pipe_compute_ring_base (struct amdgpu_device *adev, +u32 xcc_id) +{ +int num_xcc = adev->gfx.xcc_mask ?NUM_XCC (adev->gfx.xcc_mask) :1 ; + +if (num_xcc <=1 ) +return 0 ; +return xcc_id * adev->gfx.num_compute_rings; +} + +/** +* amdgpu_gfx_mec_pipe_reset_prepare - stop schedulers before MEC pipe reset HW +* +* Backs up ring state for sibling KCQs on the same (me, pipe), stops their DRM +* schedulers, and stops KFD scheduling for the node. The guilty ring is already +* backed up by amdgpu_ring_reset_helper_begin(). +*/ +void amdgpu_gfx_mec_pipe_reset_prepare (struct amdgpu_device *adev, +struct amdgpu_ring *guilty) +{ +struct amdgpu_ring *r; +unsigned int j, base; + + base =amdgpu_gfx_mec_pipe_compute_ring_base (adev, guilty->xcc_id); +for (j =0 ; j < adev->gfx.num_compute_rings; j++) { + r = &adev->gfx.compute_ring[base + j]; +if (!amdgpu_gfx_ring_on_mec_pipe (r, guilty->me, guilty->pipe)) +continue ; +if (r != guilty) +amdgpu_ring_backup_unprocessed_commands (r,NULL ); +if (amdgpu_ring_sched_ready (r)) +drm_sched_wqueue_stop (&r->sched); + } + +if (adev->kfd.init_complete) +amdgpu_amdkfd_stop_sched (adev, guilty->xcc_id); +} + +void amdgpu_gfx_mec_pipe_restart_schedulers (struct amdgpu_device *adev, +u32 me,u32 pipe,u32 xcc_id) +{ +struct amdgpu_ring *r; +unsigned int j, base; + + base =amdgpu_gfx_mec_pipe_compute_ring_base (adev, xcc_id); +for (j =0 ; j < adev->gfx.num_compute_rings; j++) { + r = &adev->gfx.compute_ring[base + j]; +if (!amdgpu_gfx_ring_on_mec_pipe (r, me, pipe)) +continue ; +if (amdgpu_ring_sched_ready (r)) +drm_sched_wqueue_start (&r->sched); + } + +if (adev->kfd.init_complete) +amdgpu_amdkfd_start_sched (adev, xcc_id); +} + +/** +* amdgpu_gfx_mec_pipe_reset_recover_queues - re-init KCQs after MEC pipe reset +* +* Re-inits and remaps every kernel compute queue on the guilty ring's MEC pipe, +* restarts schedulers, then for each queue calls amdgpu_ring_reset_helper_end() +* (ring test + fence error / reemit). Sibling queues use a synthetic fence +* context so collateral work is reemitted. +* @timedout_fence: timeout fence for the guilty ring; must be non-NULL. +* @kcq_init: IP hook (e.g. gfx_v11_0_kcq_init_queue). +*/ +int amdgpu_gfx_mec_pipe_reset_recover_queues (struct amdgpu_device *adev, +struct amdgpu_ring *guilty, +struct amdgpu_fence *timedout_fence, +amdgpu_gfx_kcq_init_queue_t kcq_init) +{ +struct amdgpu_fence collateral_reemit = {}; +struct amdgpu_ring *r; +unsigned int j, base; +int err =0 ; + +if (!timedout_fence) +return -EINVAL ; + + collateral_reemit.context = (u64)-1 ; + + base =amdgpu_gfx_mec_pipe_compute_ring_base (adev, guilty->xcc_id); +for (j =0 ; j < adev->gfx.num_compute_rings; j++) { + r = &adev->gfx.compute_ring[base + j]; +if (!amdgpu_gfx_ring_on_mec_pipe (r, guilty->me, guilty->pipe)) +continue ; + + err =kcq_init (r, true); +if (err) + goto err_sched; + err =amdgpu_mes_map_legacy_queue (adev, r,0 ); +if (err) + goto err_sched; + } + +amdgpu_gfx_mec_pipe_restart_schedulers (adev, guilty->me, guilty->pipe, + guilty->xcc_id); + +for (j =0 ; j < adev->gfx.num_compute_rings; j++) { + r = &adev->gfx.compute_ring[base + j]; +if (!amdgpu_gfx_ring_on_mec_pipe (r, guilty->me, guilty->pipe)) +continue ; + + err =amdgpu_ring_reset_helper_end ( + r, r == guilty ? timedout_fence : &collateral_reemit); +if (err) { +dev_err (adev->dev, +"ring %s failed recover after MEC pipe reset (%d)\n" , + r->name, err); +return err; + } + } + +return 0 ; + +err_sched: +amdgpu_gfx_mec_pipe_restart_schedulers (adev, guilty->me, guilty->pipe, + guilty->xcc_id); +return err; +} +bool amdgpu_gfx_is_mec_queue_enabled (struct amdgpu_device *adev,int xcc_id,int mec,int pipe,int queue) {
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +11 -0
@@ -603,6 +603,17 @@ int amdgpu_gfx_mec_queue_to_bit(struct amdgpu_device *adev, int mec, int pipe, int queue);void amdgpu_queue_mask_bit_to_mec_queue (struct amdgpu_device *adev,int bit,int *mec,int *pipe,int *queue); + +typedef int (*amdgpu_gfx_kcq_init_queue_t )(struct amdgpu_ring *ring,bool clear); + +void amdgpu_gfx_mec_pipe_reset_prepare (struct amdgpu_device *adev, +struct amdgpu_ring *guilty); +void amdgpu_gfx_mec_pipe_restart_schedulers (struct amdgpu_device *adev, +u32 me,u32 pipe,u32 xcc_id); +int amdgpu_gfx_mec_pipe_reset_recover_queues ( +struct amdgpu_device *adev,struct amdgpu_ring *guilty, +struct amdgpu_fence *timedout_fence, +amdgpu_gfx_kcq_init_queue_t kcq_init);bool amdgpu_gfx_is_mec_queue_enabled (struct amdgpu_device *adev,int xcc_id,int mec,int pipe,int queue); bool amdgpu_gfx_is_high_priority_compute_queue(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +99 -58
231 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v2 2/5 drm/amdgpu/gfx11: enable per-pipe reset support for compute queues
This allows the driver to fall back to pipe-level reset when per-queue reset fails, improving recovery success for hung compute or graphics rings.
V2: replace both gfx_v11_compute_pipe_reset_support() and gfx_v11_pipe_reset_support() with amdgpu_ring_is_reset_type_supported (Alex)
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +8 -14
@@ -1851,6 +1851,7 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block) !adev->debug_disable_gpu_ring_reset) { adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; adev->gfx.gfx_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; + adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_PIPE ; }break ;default :
@@ -1858,6 +1859,7 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block) !adev->debug_disable_gpu_ring_reset) { adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; adev->gfx.gfx_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; + adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_PIPE ; }break ; }
@@ -6807,23 +6809,12 @@ static void gfx_v11_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } -static bool gfx_v11_pipe_reset_support (struct amdgpu_device *adev) -{ -/* Disable the pipe reset until the CPFW fully support it.*/ -dev_warn_once (adev->dev,"The CPFW hasn't support pipe reset yet.\n" ); -return false; -} - -static int gfx_v11_reset_gfx_pipe (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;uint32_t reset_pipe =0 , clean_pipe =0 ;int r; -if (!gfx_v11_pipe_reset_support (adev)) -return -EOPNOTSUPP ; -gfx_v11_0_set_safe_mode (adev,0 );mutex_lock (&adev->srbm_mutex);soc21_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );
@@ -6884,6 +6875,9 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring,if (r) {dev_warn (adev->dev,"reset via MES failed and try pipe reset %d\n" , r); +if (!amdgpu_ring_is_reset_type_supported (ring, +AMDGPU_RESET_TYPE_PER_PIPE )) +return r; r =gfx_v11_reset_gfx_pipe (ring);if (r)return r;
@@ -6942,9 +6936,6 @@ static int gfx_v11_0_reset_compute_pipe(struct amdgpu_ring *ring)uint32_t reset_val, clean_val;int r; -if (!gfx_v11_pipe_reset_support (adev)) -return -EOPNOTSUPP ; -gfx_v11_0_set_safe_mode (adev,0 );mutex_lock (&adev->srbm_mutex);soc21_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );
@@ -7083,6 +7074,9 @@ static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true,0 );if (r) {dev_warn (adev->dev,"fail(%d) to reset kcq and try pipe reset\n" , r); +if (!amdgpu_ring_is_reset_type_supported (ring, +AMDGPU_RESET_TYPE_PER_PIPE )) +return r;amdgpu_gfx_mec_pipe_reset_prepare (adev, ring); r =gfx_v11_0_reset_compute_pipe (ring);if (r) {
Signature · 1 line
2.49.0
PATCH v2 3/5 drm/amdgpu/gfx_v12_0: set gfx.rs64_enable from PFP header on GFX12
In reply to Jesse Zhanggfx_v12_0_init_microcode() always loads RS64 CP ucode but never set adev->gfx.rs64_enable, so it stayed false and code that branches on it (e.g. MEC pipe reset) used the legacy CP_MEC_CNTL path incorrectly.
Match GFX11: derive RS64 mode from the PFP firmware header (v2.0) via amdgpu_ucode_hdr_version(). Log at debug when RS64 is enabled.
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +7 -0
@@ -602,6 +602,13 @@ static int gfx_v12_0_init_microcode(struct amdgpu_device *adev) "amdgpu/%s_pfp.bin", ucode_prefix);if (err) goto out; + + adev->gfx.rs64_enable =amdgpu_ucode_hdr_version ( + (union amdgpu_firmware_header *) + adev->gfx.pfp_fw->data,2 ,0 ); +if (adev->gfx.rs64_enable) +dev_dbg (adev->dev,"CP RS64 enable\n" ); +amdgpu_gfx_cp_init_microcode (adev,AMDGPU_UCODE_ID_CP_RS64_PFP );amdgpu_gfx_cp_init_microcode (adev,AMDGPU_UCODE_ID_CP_RS64_PFP_P0_STACK );
Signature · 1 line
2.49.0
PATCH v2 4/5 drm/amdgpu/gfx_v12_0: fix GFX11 MEC pipe reset ordering
In reply to Jesse ZhangHold MEC pipe reset asserted, walk every queue on that (me, pipe) and tear down CP_HQD_ACTIVE / CP_HQD_DEQUEUE_REQUEST via gfx_v11_0_clear_hqds_on_mec_pipe(), then deassert reset. Avoids releasing pipe reset while HQDs may still be active.
Legacy (non-RS64) path: read CP_MEC_CNTL for the reset mask instead of reusing CP_MEC_RS64_CNTL state.
V2:stop the schedulers for all queues on the pipe and then mark the fences with an error
and then make sure to re-enable and test all of the queues after the reset (Alex)
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 119 ++++++++++++++++--------- 1 file changed, 78 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +78 -41
@@ -5362,10 +5362,38 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring,return amdgpu_ring_reset_helper_end (ring, timedout_fence); } +/* +* With MEC pipe reset asserted, clear CP_HQD_ACTIVE / CP_HQD_DEQUEUE_REQUEST for +* every queue on (me, pipe). HQDs must be torn down while pipe reset stays +* asserted; only then clear the pipe reset bit. +* Caller must hold adev->srbm_mutex. +*/ +static void gfx_v12_0_clear_hqds_on_mec_pipe (struct amdgpu_device *adev,u32 me, +u32 pipe) +{ +unsigned int q; +int j; + +for (q =0 ; q < adev->gfx.mec.num_queue_per_pipe; q++) { +soc24_grbm_select (adev, me, pipe, q,0 ); +/* Start from a clean HQD dequeue state before forcing HQD inactive. */ +WREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE,0 ); +if (RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 ) { +WREG32_SOC15 (GC ,0 , regCP_HQD_DEQUEUE_REQUEST,1 ); +for (j =0 ; j < adev->usec_timeout; j++) { +if (!(RREG32_SOC15 (GC ,0 , regCP_HQD_ACTIVE) &1 )) +break ; +udelay (1 ); + } + } +WREG32_SOC15 (GC ,0 , regCP_HQD_DEQUEUE_REQUEST,0 ); + } +} +static int gfx_v12_0_reset_compute_pipe (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -uint32_t reset_pipe =0 , clean_pipe =0 ; +uint32_t reset_val, clean_val;int r =0 ;if (!gfx_v12_pipe_reset_support (adev))
@@ -5374,74 +5402,77 @@ static int gfx_v12_0_reset_compute_pipe(struct amdgpu_ring *ring)gfx_v12_0_set_safe_mode (adev,0 );mutex_lock (&adev->srbm_mutex);soc24_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 ); - - reset_pipe =RREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL); - clean_pipe = reset_pipe; -if (adev->gfx.rs64_enable) { + reset_val =RREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL); + clean_val = reset_val; +switch (ring->pipe) {case 0 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE0_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE0_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_RS64_CNTL , +MEC_PIPE0_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_RS64_CNTL , +MEC_PIPE0_RESET ,0 );break ;case 1 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE1_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE1_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_RS64_CNTL , +MEC_PIPE1_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_RS64_CNTL , +MEC_PIPE1_RESET ,0 );break ;case 2 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE2_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE2_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_RS64_CNTL , +MEC_PIPE2_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_RS64_CNTL , +MEC_PIPE2_RESET ,0 );break ;case 3 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE3_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_RS64_CNTL , -MEC_PIPE3_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_RS64_CNTL , +MEC_PIPE3_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_RS64_CNTL , +MEC_PIPE3_RESET ,0 );break ;default :break ; } -WREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL, reset_pipe); -WREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL, clean_pipe); +WREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL, reset_val); +gfx_v12_0_clear_hqds_on_mec_pipe (adev, ring->me, ring->pipe); +soc24_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 ); +WREG32_SOC15 (GC ,0 , regCP_MEC_RS64_CNTL, clean_val); r = (RREG32_SOC15 (GC ,0 , regCP_MEC_RS64_INSTR_PNTR) <<2 ) -RS64_FW_UC_START_ADDR_LO ; }else { + reset_val =RREG32_SOC15 (GC ,0 , regCP_MEC_CNTL); + clean_val = reset_val; +switch (ring->pipe) {case 0 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_CNTL , -MEC_ME1_PIPE0_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_CNTL , -MEC_ME1_PIPE0_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_CNTL , +MEC_ME1_PIPE0_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_CNTL , +MEC_ME1_PIPE0_RESET ,0 );break ;case 1 : - reset_pipe =REG_SET_FIELD (reset_pipe,CP_MEC_CNTL , -MEC_ME1_PIPE1_RESET ,1 ); - clean_pipe =REG_SET_FIELD (clean_pipe,CP_MEC_CNTL , -MEC_ME1_PIPE1_RESET ,0 ); + reset_val =REG_SET_FIELD (reset_val,CP_MEC_CNTL , +MEC_ME1_PIPE1_RESET ,1 ); + clean_val =REG_SET_FIELD (clean_val,CP_MEC_CNTL , +MEC_ME1_PIPE1_RESET ,0 );break ;default : -break ; +break ; } -WREG32_SOC15 (GC ,0 , regCP_MEC_CNTL, reset_pipe); -WREG32_SOC15 (GC ,0 , regCP_MEC_CNTL, clean_pipe); -/* Doesn't find the F32 MEC instruction pointer register, and suppose -* the driver won't run into the F32 mode. -*/ + +WREG32_SOC15 (GC ,0 , regCP_MEC_CNTL, reset_val); +gfx_v12_0_clear_hqds_on_mec_pipe (adev, ring->me, ring->pipe); +soc24_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 ); +WREG32_SOC15 (GC ,0 , regCP_MEC_CNTL, clean_val); }soc24_grbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex);gfx_v12_0_unset_safe_mode (adev,0 ); -dev_info (adev->dev,"The ring %s pipe resets: %s\n" , ring->name, - r ==0 ?"successfully" :"failed" ); -/* Need the ring test to verify the pipe reset result.*/ +dev_dbg (adev->dev,"The ring %s pipe resets to MEC FW start PC: %s\n" , ring->name, + r ==0 ?"successfully" :"failed" );return 0 ; }
@@ -5457,9 +5488,15 @@ static int gfx_v12_0_reset_kcq(struct amdgpu_ring *ring, r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true,0 );if (r) {dev_warn (adev->dev,"fail(%d) to reset kcq and try pipe reset\n" , r); +amdgpu_gfx_mec_pipe_reset_prepare (adev, ring); r =gfx_v12_0_reset_compute_pipe (ring); -if (r) +if (r) { +amdgpu_gfx_mec_pipe_restart_schedulers (adev, ring->me, ring->pipe, + ring->xcc_id);return r; + } +return amdgpu_gfx_mec_pipe_reset_recover_queues (adev, ring, timedout_fence, + gfx_v12_0_kcq_init_queue); } r =gfx_v12_0_kcq_init_queue (ring, true);
Signature · 1 line
2.49.0
PATCH v2 5/5 drm/amdgpu/gfx_v12_0: enable compute pipe reset flag
In reply to Jesse ZhangThis allows the driver to fall back to pipe-level reset when per-queue reset fails, improving recovery success for hung compute or graphics rings.
V2: replace both gfx_v11_compute_pipe_reset_support() and gfx_v11_pipe_reset_support() with
amdgpu_ring_is_reset_type_supported (Alex)
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +7 -13
@@ -1563,6 +1563,7 @@ static int gfx_v12_0_sw_init(struct amdgpu_ip_block *ip_block) !amdgpu_sriov_vf(adev) && !adev->debug_disable_gpu_ring_reset) { adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; + adev->gfx.compute_supported_reset |=AMDGPU_RESET_TYPE_PER_PIPE ; adev->gfx.gfx_supported_reset |=AMDGPU_RESET_TYPE_PER_QUEUE ; }break ;
@@ -5264,22 +5265,12 @@ static void gfx_v12_ip_dump(struct amdgpu_ip_block *ip_block)amdgpu_gfx_off_ctrl (adev, true); } -static bool gfx_v12_pipe_reset_support (struct amdgpu_device *adev) -{ -/* Disable the pipe reset until the CPFW fully support it.*/ -dev_warn_once (adev->dev,"The CPFW hasn't support pipe reset yet.\n" ); -return false; -} -static int gfx_v12_reset_gfx_pipe (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;uint32_t reset_pipe =0 , clean_pipe =0 ;int r; -if (!gfx_v12_pipe_reset_support (adev)) -return -EOPNOTSUPP ; -gfx_v12_0_set_safe_mode (adev,0 );mutex_lock (&adev->srbm_mutex);soc24_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );
@@ -5340,6 +5331,9 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, use_mmio,0 );if (r) {dev_warn (adev->dev,"reset via MES failed and try pipe reset %d\n" , r); +if (!amdgpu_ring_is_reset_type_supported (ring, +AMDGPU_RESET_TYPE_PER_PIPE )) +return r; r =gfx_v12_reset_gfx_pipe (ring);if (r)return r;
@@ -5396,9 +5390,6 @@ static int gfx_v12_0_reset_compute_pipe(struct amdgpu_ring *ring)uint32_t reset_val, clean_val;int r =0 ; -if (!gfx_v12_pipe_reset_support (adev)) -return -EOPNOTSUPP ; -gfx_v12_0_set_safe_mode (adev,0 );mutex_lock (&adev->srbm_mutex);soc24_grbm_select (adev, ring->me, ring->pipe, ring->queue,0 );
@@ -5488,6 +5479,9 @@ static int gfx_v12_0_reset_kcq(struct amdgpu_ring *ring, r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true,0 );if (r) {dev_warn (adev->dev,"fail(%d) to reset kcq and try pipe reset\n" , r); +if (!amdgpu_ring_is_reset_type_supported (ring, +AMDGPU_RESET_TYPE_PER_PIPE )) +return r;amdgpu_gfx_mec_pipe_reset_prepare (adev, ring); r =gfx_v12_0_reset_compute_pipe (ring);if (r) {
Signature · 1 line
2.49.0