[PATCH v2 2/2] drm/amdgpu: Avoid kcq disable during reset

[Ma, Le]

[AMD Official Use Only - AMD Internal Distribution Only]

Series is Reviewed-by: Le Ma <le.ma at amd.com>

> -----Original Message-----
> From: Lazar, Lijo <Lijo.Lazar at amd.com>
> Sent: Tuesday, November 5, 2024 3:08 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Deucher, Alexander
> <Alexander.Deucher at amd.com>; Koenig, Christian <Christian.Koenig at amd.com>;
> Ma, Le <Le.Ma at amd.com>
> Subject: [PATCH v2 2/2] drm/amdgpu: Avoid kcq disable during reset
>
> Reset sequence indicates that hardware already ran into a bad state.
> Avoid sending unmap queue request to reset KCQ. This will also cover RAS error
> scenarios which need a reset to recover, hence remove the check.
>
> Signed-off-by: Lijo Lazar <lijo.lazar at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 445220e9773e..d995a1801d2a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -515,15 +515,7 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev,
> int xcc_id)
>       if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)
>               return -EINVAL;
>
> -     if (!kiq_ring->sched.ready || adev->job_hang)
> -             return 0;
> -     /**
> -      * This is workaround: only skip kiq_ring test
> -      * during ras recovery in suspend stage for gfx9.4.3
> -      */
> -     if ((amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3) ||
> -          amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 4)) &&
> -         amdgpu_ras_in_recovery(adev))
> +     if (!kiq_ring->sched.ready || adev->job_hang || amdgpu_in_reset(adev))
>               return 0;
>
>       spin_lock(&kiq->ring_lock);
> --
> 2.25.1