[Public]
Reviewed-by: Prike Liang <prike.li...@amd.com>
Regards,
Prike
> -----Original Message-----
> From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of
> Jesse.Zhang
> Sent: Monday, April 28, 2025 10:40 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <alexander.deuc...@amd.com>; Koenig, Christian
> <christian.koe...@amd.com>; Zhang, Jesse(Jie) <jesse.zh...@amd.com>;
> Zhang, Jesse(Jie) <jesse.zh...@amd.com>
> Subject: [PATCH] drm/amdgpu: Fix API status offset for MES queue reset
>
> The mes_v11_0_reset_hw_queue and mes_v12_0_reset_hw_queue functions
> were using the wrong union type (MESAPI__REMOVE_QUEUE) when getting the
> offset for api_status. Since these functions handle queue reset operations,
> they
> should use MESAPI__RESET union instead.
>
> This fixes the polling of API status during hardware queue reset operations
> in the
> MES for both v11 and v12 versions.
>
> Signed-off-by: Jesse Zhang <jesse.zh...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> index 0a5b7a296f08..b34d7bedc317 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> @@ -497,7 +497,7 @@ static int mes_v11_0_reset_hw_queue(struct
> amdgpu_mes *mes,
>
> return mes_v11_0_submit_pkt_and_poll_completion(mes,
> &mes_reset_queue_pkt, sizeof(mes_reset_queue_pkt),
> - offsetof(union MESAPI__REMOVE_QUEUE, api_status));
> + offsetof(union MESAPI__RESET, api_status));
> }
>
> static int mes_v11_0_map_legacy_queue(struct amdgpu_mes *mes, diff --git
> a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> index 1f7614dccb00..ee8b531b713d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> @@ -517,7 +517,7 @@ static int mes_v12_0_reset_hw_queue(struct
> amdgpu_mes *mes,
>
> return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe,
> &mes_reset_queue_pkt, sizeof(mes_reset_queue_pkt),
> - offsetof(union MESAPI__REMOVE_QUEUE, api_status));
> + offsetof(union MESAPI__RESET, api_status));
> }
>
> static int mes_v12_0_map_legacy_queue(struct amdgpu_mes *mes,
> --
> 2.49.0
