[PATCH 1/2] drm/amdgpu: enable gfx12 queue reset flag

[Huang, Tim]

[Public]

Hi Jesse,

> -----Original Message-----
> From: Jesse.zhang at amd.com <jesse.zhang at amd.com>
> Sent: Monday, January 6, 2025 3:17 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Koenig, Christian
> <Christian.Koenig at amd.com>; Huang, Tim <Tim.Huang at amd.com>; Zhu,
> Jiadong <Jiadong.Zhu at amd.com>; Zhang, Jesse(Jie) <Jesse.Zhang at amd.com>
> Subject: [PATCH 1/2] drm/amdgpu: enable gfx12 queue reset flag
>
> Enable the kcg and kcq queue reset flag

A typo here, it should be "kgq" ?

With this addressed, this series is
Reviewed-by: Tim Huang <tim.huang at amd.com>


Tim
>
> Signed-off-by: Jesse Zhang <jesse.zhang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> index 3aa34c55554d..69941442f00b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> @@ -1477,11 +1477,19 @@ static int gfx_v12_0_sw_init(struct
> amdgpu_ip_block *ip_block)
>               }
>       }
>
> -     /* TODO: Add queue reset mask when FW fully supports it */
>       adev->gfx.gfx_supported_reset =
>               amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);
>       adev->gfx.compute_supported_reset =
>               amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);
> +     switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
> +     case IP_VERSION(12, 0, 0):
> +     case IP_VERSION(12, 0, 1):
> +             if ((adev->gfx.me_fw_version >= 2660) &&
> +                         (adev->gfx.mec_fw_version >= 2920)) {
> +                             adev->gfx.compute_supported_reset |=
> AMDGPU_RESET_TYPE_PER_QUEUE;
> +                             adev->gfx.gfx_supported_reset |=
> AMDGPU_RESET_TYPE_PER_QUEUE;
> +             }
> +     }
>
>       if (!adev->enable_mes_kiq) {
>               r = amdgpu_gfx_kiq_init(adev, GFX12_MEC_HPD_SIZE, 0);
> --
> 2.25.1