Patches #9-#22 Reviewed-by: Christian König <christian.koe...@amd.com>
On 15.07.25 18:12, Alex Deucher wrote:
> Ping?
>
> Alex
>
> On Fri, Jul 11, 2025 at 6:48 PM Alex Deucher <alexander.deuc...@amd.com>
> wrote:
>>
>> Re-emit the unprocessed state after resetting the queue.
>>
>> Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 9 ++-------
>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
>> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
>> index e2ff4b373a319..d80f1fb261d1e 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
>> @@ -3569,7 +3569,7 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring
>> *ring,
>> if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)
>> return -EINVAL;
>>
>> - drm_sched_wqueue_stop(&ring->sched);
>> + amdgpu_ring_reset_helper_begin(ring, timedout_fence);
>>
>> spin_lock_irqsave(&kiq->ring_lock, flags);
>>
>> @@ -3626,12 +3626,7 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring
>> *ring,
>> return r;
>> }
>>
>> - r = amdgpu_ring_test_ring(ring);
>> - if (r)
>> - return r;
>> - amdgpu_fence_driver_force_completion(ring);
>> - drm_sched_wqueue_start(&ring->sched);
>> - return 0;
>> + return amdgpu_ring_reset_helper_end(ring, timedout_fence);
>> }
>>
>> enum amdgpu_gfx_cp_ras_mem_id {
>> --
>> 2.50.0
>>
