drm/amdkfd: fallback to pipe reset on queue reset fail for gfx9
Subsystems (3)
PATCH 1/1 drm/amdkfd: fallback to pipe reset on queue reset fail for gfx9
If queue reset fails, tell the CP to reset the pipe.
Since queues multiplex context per pipe and we've issues a device wide preemption prior to the hang, we can assume the hung pipe only has one queue to reset on pipe reset.
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +31 -15
@@ -1173,12 +1173,30 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,return queue_addr; } +/* assume queue acquired */ +static int kgd_gfx_v9_hqd_dequeue_wait (struct amdgpu_device *adev,uint32_t inst, +unsigned int utimeout) +{ +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; + +while (true) { +uint32_t temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); + +if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) +return 0 ; + +if (time_after (jiffies, end_jiffies)) +return -ETIME ; + +usleep_range (500 ,1000 ); + } +} +uint64_t kgd_gfx_v9_hqd_reset (struct amdgpu_device *adev,uint32_t pipe_id,uint32_t queue_id,uint32_t inst,unsigned int utimeout) { -uint32_t low, high, temp; -unsigned long end_jiffies; +uint32_t low, high, pipe_reset_data =0 ;uint64_t queue_addr =0 ;kgd_gfx_v9_acquire_queue (adev, pipe_id, queue_id, inst);
@@ -1202,25 +1220,23 @@ uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,/* assume previous dequeue request issued will take affect after reset */ WREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_COMPUTE_QUEUE_RESET,0x1 ); - end_jiffies = (utimeout *HZ /1000 ) + jiffies; -while (true) { - temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); +if (!kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + goto unlock_out; -if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) -break ; +pr_debug ("Attempting pipe reset on XCC %i pipe id %i\n" , inst, pipe_id); -if (time_after (jiffies, end_jiffies)) { - queue_addr =0 ; -break ; - } + pipe_reset_data =REG_SET_FIELD (pipe_reset_data,CP_MEC_CNTL ,MEC_ME1_PIPE0_RESET ,1 ); + pipe_reset_data = pipe_reset_data << pipe_id; -usleep_range (500 ,1000 ); - } +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL, pipe_reset_data); +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL,0 ); -pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , - inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" ); +if (kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + queue_addr =0 ; unlock_out: +pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , + inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" );amdgpu_gfx_rlc_exit_safe_mode (adev, inst);kgd_gfx_v9_release_queue (adev, inst);
Signature · 1 line
2.34.1
[Public]
Ping on review.
Thanks,
Jon
Quoted 110 lines
-----Original Message-----
From: Kim, Jonathan <[email protected]>
Sent: Friday, August 2, 2024 12:38 PM
To: [email protected]
Cc: Kuehling, Felix <[email protected]>; Deucher, Alexander <[email protected]>; Kim, Jonathan <[email protected]>; Kim, Jonathan <[email protected]>
Subject: [PATCH] drm/amdkfd: fallback to pipe reset on queue reset fail for gfx9If queue reset fails, tell the CP to reset the pipe.
Since queues multiplex context per pipe and we've issues a device wide preemption prior to the hang, we can assume the hung pipe only has one queue to reset on pipe reset.Signed-off-by Jonathan Kim <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 46 +++++++++++++- ----- 1 file changed, 31 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +20
-2@@ -1173,12 +1173,30 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(structamdgpu_device *adev, return queue_addr; } +/* assume queue acquired */ +static int kgd_gfx_v9_hqd_dequeue_wait (struct amdgpu_device *adev,uint32_t inst, +unsigned int utimeout) +{ +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; + +while (true) { +uint32_t temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); + +if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) +return 0 ; + +if (time_after (jiffies, end_jiffies)) +return -ETIME ; + +usleep_range (500 ,1000 ); + } +} +uint64_t kgd_gfx_v9_hqd_reset (struct amdgpu_device *adev,uint32_t pipe_id,uint32_t queue_id,uint32_t inst,unsigned int utimeout) { -uint32_t low, high, temp; -unsigned long end_jiffies; +uint32_t low, high, pipe_reset_data =0 ;uint64_t queue_addr = 0; kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +7
-13@@ -1202,25 +1220,23 @@ uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,/* assume previous dequeue request issued will take affect after reset */ WREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_COMPUTE_QUEUE_RESET,0x1 ); - end_jiffies = (utimeout *HZ /1000 ) + jiffies; -while (true) { - temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); +if (!kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + goto unlock_out; -if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) -break ; +pr_debug ("Attempting pipe reset on XCC %i pipe id %i\n" , inst, pipe_id); -if (time_after (jiffies, end_jiffies)) { - queue_addr =0 ; -break ; - } + pipe_reset_data =REG_SET_FIELD (pipe_reset_data,CP_MEC_CNTL ,MEC_ME1_PIPE0_RESET ,1 ); + pipe_reset_data = pipe_reset_data << pipe_id; -usleep_range (500 ,1000 ); - } +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL, pipe_reset_data); +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL,0 ); - pr_debug("queue reset on XCC %i pipe id %i queue id %i %s\n", - inst, pipe_id, queue_id, !!queue_addr ? "succeeded!" :"failed!");
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +4
-0+if (kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + queue_addr =0 ; unlock_out: + pr_debug("queue reset on XCC %i pipe id %i queue id %i %s\n", + inst, pipe_id, queue_id, !!queue_addr ? "succeeded!" :"failed!"); amdgpu_gfx_rlc_exit_safe_mode(adev, inst); kgd_gfx_v9_release_queue(adev, inst);--
2.34.1
Quoted 5 lines · Jonathan Kim
If queue reset fails, tell the CP to reset the pipe.
Since queues multiplex context per pipe and we've issues a device wide preemption prior to the hang, we can assume the hung pipe only has one queue to reset on pipe reset.
Is there a specific CP or PSP firmware version required for this? If so, we should check for it before attempting this if it will cause a problem.
Other than that:
Quoted 83 lines
Signed-off-by Jonathan Kim <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +31
-16@@ -1173,12 +1173,30 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,return queue_addr; } +/* assume queue acquired */ +static int kgd_gfx_v9_hqd_dequeue_wait (struct amdgpu_device *adev,uint32_t inst, +unsigned int utimeout) +{ +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; + +while (true) { +uint32_t temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); + +if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) +return 0 ; + +if (time_after (jiffies, end_jiffies)) +return -ETIME ; + +usleep_range (500 ,1000 ); + } +} +uint64_t kgd_gfx_v9_hqd_reset (struct amdgpu_device *adev,uint32_t pipe_id,uint32_t queue_id,uint32_t inst,unsigned int utimeout) { -uint32_t low, high, temp; -unsigned long end_jiffies; +uint32_t low, high, pipe_reset_data =0 ;uint64_t queue_addr =0 ;kgd_gfx_v9_acquire_queue (adev, pipe_id, queue_id, inst);@@ -1202,25 +1220,23 @@ uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,/* assume previous dequeue request issued will take affect after reset */ WREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_COMPUTE_QUEUE_RESET,0x1 ); - end_jiffies = (utimeout *HZ /1000 ) + jiffies; -while (true) { - temp =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_HQD_ACTIVE); +if (!kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + goto unlock_out; -if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) -break ; +pr_debug ("Attempting pipe reset on XCC %i pipe id %i\n" , inst, pipe_id); -if (time_after (jiffies, end_jiffies)) { - queue_addr =0 ; -break ; - } + pipe_reset_data =REG_SET_FIELD (pipe_reset_data,CP_MEC_CNTL ,MEC_ME1_PIPE0_RESET ,1 ); + pipe_reset_data = pipe_reset_data << pipe_id; -usleep_range (500 ,1000 ); - } +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL, pipe_reset_data); +WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL,0 ); -pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , - inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" ); +if (kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + queue_addr =0 ; unlock_out: +pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , + inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" );amdgpu_gfx_rlc_exit_safe_mode (adev, inst);kgd_gfx_v9_release_queue (adev, inst); --2.34.1
[Public]
Quoted 17 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Friday, August 9, 2024 11:55 AM
To: Kim, Jonathan <[email protected]>
Cc: [email protected]; Kuehling, Felix <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdkfd: fallback to pipe reset on queue reset fail for gfx9Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
Quoted 1 line · Jonathan Kim
Quoted 8 lines
Quoted 4 lines
If queue reset fails, tell the CP to reset the pipe.
Since queues multiplex context per pipe and we've issues a device wide preemption prior to the hang, we can assume the hung pipe only has one queue to reset on pipe reset.Is there a specific CP or PSP firmware version required for this? If so, we should check for it before attempting this if it will cause a problem.
Thanks for the review Alex.
Worst case is that the MMIO reg write doesn't do anything and we end up with extra CP active poll wait cycles before falling back to adapter reset. We may run into scenarios where pipe reset doesn't help anyways even if we did have the right FW.
Jon
Quoted 98 lines
Other than that:
Reviewed-by Alex Deucher <[email protected]>Quoted 4 lines
Signed-off-by Jonathan Kim <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 46+++++++++++++------
Review
Quoted 3 lines
1 file changed, 31 insertions(+), 15 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.cdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct
Quoted 4 lines
index
32f28c12077b..c63528a4e894100644drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-0@@ -1173,12 +1173,30 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-0return queue_addr; } +/* assume queue acquired */ +static int kgd_gfx_v9_hqd_dequeue_wait(struct amdgpu_device *adev,
uint32_tinst,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +6
-0+ unsigned int utimeout) +{ +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; + +while (true) { + uint32_t temp = RREG32_SOC15(GC, GET_INST(GC, inst),
mmCP_HQD_ACTIVE);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct
Quoted 22 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +12
-2+ +if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) +return 0 ; + +if (time_after (jiffies, end_jiffies)) +return -ETIME ; + +usleep_range (500 ,1000 ); + } +} +uint64_t kgd_gfx_v9_hqd_reset (struct amdgpu_device *adev,uint32_t pipe_id,uint32_t queue_id,uint32_t inst,unsigned int utimeout) { -uint32_t low, high, temp; -unsigned long end_jiffies; +uint32_t low, high, pipe_reset_data =0 ;uint64_t queue_addr =0 ;kgd_gfx_v9_acquire_queue (adev, pipe_id, queue_id, inst);@@ -1202,25 +1220,23 @@ uint64_t kgd_gfx_v9_hqd_reset(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct · line 1221
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-0/* assume previous dequeue request issued will take affect after reset */ WREG32_SOC15(GC, GET_INST(GC, inst),
mmSPI_COMPUTE_QUEUE_RESET,0x1);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-3- end_jiffies = (utimeout *HZ /1000 ) + jiffies; -while (true) { - temp = RREG32_SOC15(GC, GET_INST(GC, inst),
mmCP_HQD_ACTIVE);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +4
-6+if (!kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + goto unlock_out; -if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) -break ; +pr_debug ("Attempting pipe reset on XCC %i pipe id %i\n" , inst, pipe_id); -if (time_after (jiffies, end_jiffies)) { - queue_addr =0 ; -break ; - } + pipe_reset_data = REG_SET_FIELD(pipe_reset_data, CP_MEC_CNTL,
MEC_ME1_PIPE0_RESET, 1);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-2+ pipe_reset_data = pipe_reset_data << pipe_id; -usleep_range (500 ,1000 ); - } + WREG32_SOC15(GC, GET_INST(GC, inst), mmCP_MEC_CNTL,
pipe_reset_data);Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +5
-3+WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL,0 ); -pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , - inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" ); +if (kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + queue_addr =0 ; unlock_out: +pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , + inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" );amdgpu_gfx_rlc_exit_safe_mode (adev, inst);kgd_gfx_v9_release_queue (adev, inst); --2.34.1
Quoted 25 lines · Jonathan
[Public]
Quoted 22 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Friday, August 9, 2024 11:55 AM
To: Kim, Jonathan <[email protected]>
Cc: [email protected]; Kuehling, Felix <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdkfd: fallback to pipe reset on queue reset fail for gfx9Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
Quoted 5 lines · Jonathan Kim
If queue reset fails, tell the CP to reset the pipe.
Since queues multiplex context per pipe and we've issues a device wide preemption prior to the hang, we can assume the hung pipe only has one queue to reset on pipe reset.
Quoted 7 lines
Quoted 3 lines
Is there a specific CP or PSP firmware version required for this? If so, we should check for it before attempting this if it will cause a problem.
Thanks for the review Alex.
Worst case is that the MMIO reg write doesn't do anything and we end up with extra CP active poll wait cycles before falling back to adapter reset. We may run into scenarios where pipe reset doesn't help anyways even if we did have the right FW.
And I supposed there may be cases where it might help as well beyond just the case that requires firmware changes.
Thanks,
Alex
Quoted 101 lines
Jon
Quoted 98 lines
Other than that:
Reviewed-by Alex Deucher <[email protected]>Quoted 4 lines
Signed-off-by Jonathan Kim <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 46+++++++++++++------
Review
Quoted 3 lines
1 file changed, 31 insertions(+), 15 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.cdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct
Quoted 4 lines
index
32f28c12077b..c63528a4e894100644drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-0@@ -1173,12 +1173,30 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-0return queue_addr; } +/* assume queue acquired */ +static int kgd_gfx_v9_hqd_dequeue_wait(struct amdgpu_device *adev,
uint32_tinst,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +6
-0+ unsigned int utimeout) +{ +unsigned long end_jiffies = (utimeout *HZ /1000 ) + jiffies; + +while (true) { + uint32_t temp = RREG32_SOC15(GC, GET_INST(GC, inst),
mmCP_HQD_ACTIVE);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct
Quoted 22 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +12
-2+ +if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) +return 0 ; + +if (time_after (jiffies, end_jiffies)) +return -ETIME ; + +usleep_range (500 ,1000 ); + } +} +uint64_t kgd_gfx_v9_hqd_reset (struct amdgpu_device *adev,uint32_t pipe_id,uint32_t queue_id,uint32_t inst,unsigned int utimeout) { -uint32_t low, high, temp; -unsigned long end_jiffies; +uint32_t low, high, pipe_reset_data =0 ;uint64_t queue_addr =0 ;kgd_gfx_v9_acquire_queue (adev, pipe_id, queue_id, inst);@@ -1202,25 +1220,23 @@ uint64_t kgd_gfx_v9_hqd_reset(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct · line 1221
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-0/* assume previous dequeue request issued will take affect after reset */ WREG32_SOC15(GC, GET_INST(GC, inst),
mmSPI_COMPUTE_QUEUE_RESET,0x1);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0
-3- end_jiffies = (utimeout *HZ /1000 ) + jiffies; -while (true) { - temp = RREG32_SOC15(GC, GET_INST(GC, inst),
mmCP_HQD_ACTIVE);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +4
-6+if (!kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + goto unlock_out; -if (!(temp &CP_HQD_ACTIVE__ACTIVE_MASK )) -break ; +pr_debug ("Attempting pipe reset on XCC %i pipe id %i\n" , inst, pipe_id); -if (time_after (jiffies, end_jiffies)) { - queue_addr =0 ; -break ; - } + pipe_reset_data = REG_SET_FIELD(pipe_reset_data, CP_MEC_CNTL,
MEC_ME1_PIPE0_RESET, 1);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-2+ pipe_reset_data = pipe_reset_data << pipe_id; -usleep_range (500 ,1000 ); - } + WREG32_SOC15(GC, GET_INST(GC, inst), mmCP_MEC_CNTL,
pipe_reset_data);Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +5
-3+WREG32_SOC15 (GC ,GET_INST (GC , inst), mmCP_MEC_CNTL,0 ); -pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , - inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" ); +if (kgd_gfx_v9_hqd_dequeue_wait (adev, inst, utimeout)) + queue_addr =0 ; unlock_out: +pr_debug ("queue reset on XCC %i pipe id %i queue id %i %s\n" , + inst, pipe_id, queue_id, !!queue_addr ?"succeeded!" :"failed!" );amdgpu_gfx_rlc_exit_safe_mode (adev, inst);kgd_gfx_v9_release_queue (adev, inst); --2.34.1