[PATCH 3/6] drm/amdkfd: enable watch points globally for gfx943

[Kim, Jonathan]

[Public]

> -----Original Message-----
> From: Huang, JinHuiEric <JinHuiEric.Huang at amd.com>
> Sent: Thursday, July 6, 2023 2:19 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Kim, Jonathan <Jonathan.Kim at amd.com>; Kim, Jonathan
> <Jonathan.Kim at amd.com>; Kuehling, Felix <Felix.Kuehling at amd.com>;
> Huang, JinHuiEric <JinHuiEric.Huang at amd.com>
> Subject: [PATCH 3/6] drm/amdkfd: enable watch points globally for gfx943
>
> From: Jonathan Kim <jonathan.kim at amd.com>
>
> Set watch points for all xcc instances on GFX943.
>
> Signed-off-by: Jonathan Kim <jonathan.kim at amd.com>
> Reviewed-by: Felix Kuehling <felix.kuehling at amd.com>
> Signed-off-by: Eric Huang <jinhuieric.huang at amd.com>

This patch is Reviewed-by: Jonathan Kim <jonathan.kim at amd.com>

> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
> index 24083db44724..190b03efe5ff 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c
> @@ -446,7 +446,8 @@ int kfd_dbg_trap_set_dev_address_watch(struct
> kfd_process_device *pdd,
>                                       uint32_t *watch_id,
>                                       uint32_t watch_mode)
>  {
> -     int r = kfd_dbg_get_dev_watch_id(pdd, watch_id);
> +     int xcc_id, r = kfd_dbg_get_dev_watch_id(pdd, watch_id);
> +     uint32_t xcc_mask = pdd->dev->xcc_mask;
>
>       if (r)
>               return r;
> @@ -460,14 +461,15 @@ int kfd_dbg_trap_set_dev_address_watch(struct
> kfd_process_device *pdd,
>       }
>
>       amdgpu_gfx_off_ctrl(pdd->dev->adev, false);
> -     pdd->watch_points[*watch_id] = pdd->dev->kfd2kgd-
> >set_address_watch(
> +     for_each_inst(xcc_id, xcc_mask)
> +             pdd->watch_points[*watch_id] = pdd->dev->kfd2kgd-
> >set_address_watch(
>                               pdd->dev->adev,
>                               watch_address,
>                               watch_address_mask,
>                               *watch_id,
>                               watch_mode,
>                               pdd->dev->vm_info.last_vmid_kfd,
> -                             0);
> +                             xcc_id);
>       amdgpu_gfx_off_ctrl(pdd->dev->adev, true);
>
>       if (!pdd->dev->kfd->shared_resources.enable_mes)
> --
> 2.34.1