| Message ID | 20230125195401.4183544-33-jonathan.kim@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Upstream of kernel support for AMDGPU ISA debugging | expand |
Am 2023-01-25 um 14:54 schrieb Jonathan Kim: > Bump the minor version to declare debugging capability is now > available. > > Signed-off-by: Jonathan Kim <jonathan.kim@amd.com> > Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> This needs to be bumped to 1.13 once you rebase on the latest staging. With that fixed, the patch is Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> > --- > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1 - > include/uapi/linux/kfd_ioctl.h | 3 ++- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > index da74a6ef4d9b..c28d4b2dd0ef 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c > @@ -2896,7 +2896,6 @@ static int kfd_ioctl_set_debug_trap(struct file *filep, struct kfd_process *p, v > if (!r) > target->exception_enable_mask = args->enable.exception_mask; > > - pr_warn("Debug functions limited\n"); > break; > case KFD_IOC_DBG_TRAP_DISABLE: > r = kfd_dbg_trap_disable(target); > diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h > index 9ef4eed45c19..a0efe1ccdbd6 100644 > --- a/include/uapi/linux/kfd_ioctl.h > +++ b/include/uapi/linux/kfd_ioctl.h > @@ -37,9 +37,10 @@ > * - 1.9 - Add available memory ioctl > * - 1.10 - Add SMI profiler event log > * - 1.11 - Add unified memory for ctx save/restore area > + * - 1.12 - Add debugger API > */ > #define KFD_IOCTL_MAJOR_VERSION 1 > -#define KFD_IOCTL_MINOR_VERSION 11 > +#define KFD_IOCTL_MINOR_VERSION 12 > > struct kfd_ioctl_get_version_args { > __u32 major_version; /* from KFD */
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index da74a6ef4d9b..c28d4b2dd0ef 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -2896,7 +2896,6 @@ static int kfd_ioctl_set_debug_trap(struct file *filep, struct kfd_process *p, v if (!r) target->exception_enable_mask = args->enable.exception_mask; - pr_warn("Debug functions limited\n"); break; case KFD_IOC_DBG_TRAP_DISABLE: r = kfd_dbg_trap_disable(target); diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index 9ef4eed45c19..a0efe1ccdbd6 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -37,9 +37,10 @@ * - 1.9 - Add available memory ioctl * - 1.10 - Add SMI profiler event log * - 1.11 - Add unified memory for ctx save/restore area + * - 1.12 - Add debugger API */ #define KFD_IOCTL_MAJOR_VERSION 1 -#define KFD_IOCTL_MINOR_VERSION 11 +#define KFD_IOCTL_MINOR_VERSION 12 struct kfd_ioctl_get_version_args { __u32 major_version; /* from KFD */