[PATCH] Revert "drm/amdgpu/gfx9: put queue resets behind a debug option"

[Zhu, Jiadong]

[AMD Official Use Only - AMD Internal Distribution Only]

Acked-by: Jiadong Zhu <Jiadong.Zhu at amd.com>


> -----Original Message-----
> From: Deucher, Alexander <Alexander.Deucher at amd.com>
> Sent: Wednesday, October 16, 2024 4:00 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Kim, Jonathan
> <Jonathan.Kim at amd.com>; Zhu, Jiadong <Jiadong.Zhu at amd.com>
> Subject: [PATCH] Revert "drm/amdgpu/gfx9: put queue resets behind a debug
> option"
>
> This reverts commit 7c1a2d8aba6cadde0cc542b2d805edc0be667e79.
>
> Extended validation has completed successfully, so enable these features by
> default.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: Jonathan Kim <jonathan.kim at amd.com>
> Cc: Jiadong Zhu <Jiadong.Zhu at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 ----
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c             | 4 ----
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c           | 6 ------
>  3 files changed, 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index 2817198d4b55..740525407154 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -1132,10 +1132,6 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct
> amdgpu_device *adev,
>       uint32_t low, high;
>       uint64_t queue_addr = 0;
>
> -     if (!adev->debug_exp_resets &&
> -         !adev->gfx.num_gfx_rings)
> -             return 0;
> -
>       kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);
>       amdgpu_gfx_rlc_enter_safe_mode(adev, inst);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index b5102da25798..508a2dcc0b1a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -7260,10 +7260,6 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring
> *ring,
>       unsigned long flags;
>       int i, r;
>
> -     if (!adev->debug_exp_resets &&
> -         !adev->gfx.num_gfx_rings)
> -             return -EINVAL;
> -
>       if (amdgpu_sriov_vf(adev))
>               return -EINVAL;
>
> 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 ccd17dca0396..4fd7e9c5856c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -3055,9 +3055,6 @@ static void gfx_v9_4_3_ring_soft_recovery(struct
> amdgpu_ring *ring,
>       struct amdgpu_device *adev = ring->adev;
>       uint32_t value = 0;
>
> -     if (!adev->debug_exp_resets)
> -             return;
> -
>       value = REG_SET_FIELD(value, SQ_CMD, CMD, 0x03);
>       value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
>       value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1); @@ -
> 3573,9 +3570,6 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring,
>       unsigned long flags;
>       int r;
>
> -     if (!adev->debug_exp_resets)
> -             return -EINVAL;
> -
>       if (amdgpu_sriov_vf(adev))
>               return -EINVAL;
>
> --
> 2.46.2