to contain profiler kernel driver changes.
Signed-off-by: James Zhu <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.c | 114 +++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.h | 69 +++++++++++
include/uapi/drm/amdgpu_drm.h | 19 ++++
7 files changed, 213 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.h
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
b/drivers/gpu/drm/amd/amdgpu/Makefile
index ebe08947c5a3..835900318353 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -67,7 +67,8 @@ amdgpu-y += amdgpu_device.o amdgpu_doorbell_mgr.o
amdgpu_kms.o \
amdgpu_fw_attestation.o amdgpu_securedisplay.o \
amdgpu_eeprom.o amdgpu_mca.o amdgpu_psp_ta.o amdgpu_lsdma.o \
amdgpu_ring_mux.o amdgpu_xcp.o amdgpu_seq64.o amdgpu_aca.o
amdgpu_dev_coredump.o \
- amdgpu_cper.o amdgpu_userq_fence.o amdgpu_eviction_fence.o amdgpu_ip.o
+ amdgpu_cper.o amdgpu_userq_fence.o amdgpu_eviction_fence.o amdgpu_ip.o \
+ amdgpu_profiler.o
amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 314a498c5726..bf3ad584dd41 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -115,6 +115,7 @@
#include "amdgpu_seq64.h"
#include "amdgpu_reg_state.h"
#include "amdgpu_userq.h"
+#include "amdgpu_profiler.h"
#include "amdgpu_eviction_fence.h"
#if defined(CONFIG_DRM_AMD_ISP)
#include "amdgpu_isp.h"
@@ -1319,6 +1320,8 @@ struct amdgpu_device {
bool userq_halt_for_enforce_isolation;
struct amdgpu_uid *uid_info;
+ struct amdgpu_profiler_mgr prof_mgr;
+
/* KFD
* Must be last --ends in a flexible-array member.
*/
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index cee90f9e58a9..18d83f0c47a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2936,6 +2936,7 @@ static int amdgpu_drm_release(struct inode *inode, struct
file *filp)
fpriv->evf_mgr.fd_closing = true;
amdgpu_eviction_fence_destroy(&fpriv->evf_mgr);
amdgpu_userq_mgr_fini(&fpriv->userq_mgr);
+ amdgpu_profiler_mgr_fini(fpriv_to_prof_mgr(fpriv), fpriv);
drm_dev_exit(idx);
}
@@ -3044,6 +3045,7 @@ const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {
DRM_IOCTL_DEF_DRV(AMDGPU_USERQ_SIGNAL, amdgpu_userq_signal_ioctl,
DRM_AUTH|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(AMDGPU_USERQ_WAIT, amdgpu_userq_wait_ioctl,
DRM_AUTH|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(AMDGPU_GEM_LIST_HANDLES,
amdgpu_gem_list_handles_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
+ DRM_IOCTL_DEF_DRV(AMDGPU_PROFILER, amdgpu_profiler_ioctl,
DRM_AUTH|DRM_RENDER_ALLOW),
};
static const struct drm_driver amdgpu_kms_driver = {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 75976ca00ccf..6ea4d52c8634 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -1573,6 +1573,10 @@ int amdgpu_driver_open_kms(struct drm_device *dev,
struct drm_file *file_priv)
if (r)
DRM_WARN("Can't setup usermode queues, use legacy workload
submission only\n");
+ r = amdgpu_profiler_mgr_init(fpriv_to_prof_mgr(fpriv), fpriv);
+ if (r)
+ DRM_WARN("Can't setup profiler\n");
+
r = amdgpu_eviction_fence_init(&fpriv->evf_mgr);
if (r)
goto error_vm;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.c
new file mode 100644
index 000000000000..157e6d2f888e
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.c
@@ -0,0 +1,114 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "amdgpu.h"
+
+/*
+ * Profiler revision change log
+ *
+ * 1.1 - Initial revision
+ */
+
+#define AMDGPU_PROFILER_VERSION_MAJOR 1
+#define AMDGPU_PROFILER_VERSION_MINOR 1
+
+int amdgpu_profiler_ioctl(
+ struct drm_device *dev,
+ void __user *data,
+ struct drm_file *filp)
+{
+ struct amdgpu_fpriv *fpriv = filp->driver_priv;
+ struct amdgpu_device *adev = fpriv_to_adev(fpriv);
+ struct amdgpu_profiler_mgr *prof_mgr = fpriv_to_prof_mgr(fpriv);
+ struct drm_amdgpu_profiler_args *args = data;
+
+ dev_dbg(adev->dev, "Profiler IOCTL op %d on render node %d xcp %d",
+ args->op, adev->ddev.render->index,
AMDGPU_XCP_ID(fpriv->xcp_id));
+
+ switch (args->op) {
+ case AMDGPU_PROFILER_VERSION:
+ args->version = AMDGPU_PROFILER_VERSION_MAJOR << 16 |
+ AMDGPU_PROFILER_VERSION_MINOR;
+ return 0;
+
+ default:
+ dev_err(adev->dev, "Invalid option: %i\n", args->op);
+ return -EINVAL;
+ }
+ return -EINVAL;
+}
+
+int amdgpu_profiler_mgr_init(
+ struct amdgpu_profiler_mgr *prof_mgr,
+ struct amdgpu_fpriv *fpriv)
+{
+ struct amdgpu_profiler_xcp_mgr *prof_xcp_mgr;
+ struct amdgpu_device *adev = fpriv_to_adev(fpriv);
+
+ if (fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION)
+ return 0;
+
+ prof_xcp_mgr = &prof_mgr->prof_xcp_mgr[fpriv->xcp_id];
+ if (prof_xcp_mgr->is_init) {
+ kref_get(&prof_xcp_mgr->ref);
+ return 0;
+ }
+
+ dev_dbg(adev->dev, "Initialize profiler on render node %d xcp %d",
+ adev->ddev.render->index, fpriv->xcp_id);
+ kref_init(&prof_xcp_mgr->ref);
+ mutex_init(&prof_xcp_mgr->mutex);
+ prof_xcp_mgr->xcp_id = fpriv->xcp_id;
+
+ prof_xcp_mgr->is_init = true;
+
+ return 0;
+}
+
+void amdgpu_profiler_mgr_release(struct kref *ref)
+{
+ struct amdgpu_profiler_xcp_mgr *prof_xcp_mgr =
+ container_of(ref, struct amdgpu_profiler_xcp_mgr, ref);
+
+ if (!prof_xcp_mgr->is_init)
+ return;
+
+ mutex_destroy(&prof_xcp_mgr->mutex);
+ prof_xcp_mgr->is_init = false;
+}
+
+void amdgpu_profiler_mgr_fini(
+ struct amdgpu_profiler_mgr *prof_mgr,
+ struct amdgpu_fpriv *fpriv)
+{
+ struct amdgpu_profiler_xcp_mgr *prof_xcp_mgr;
+
+ if (fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION)
+ return;
+
+ prof_xcp_mgr = &prof_mgr->prof_xcp_mgr[fpriv->xcp_id];
+ if (!prof_xcp_mgr->is_init)
+ return;
+
+ kref_put(&prof_xcp_mgr->ref, amdgpu_profiler_mgr_release);
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.h
new file mode 100644
index 000000000000..18da6267562a
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_profiler.h
@@ -0,0 +1,69 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef AMDGPU_PROFILER_H_
+#define AMDGPU_PROFILER_H_
+
+#define AMDGPU_XCC_MASK(adev) ((1U << NUM_XCC(adev->gfx.xcc_mask)) - 1)
+
+#define AMDGPU_XCP_ID(x) (x == AMDGPU_XCP_NO_PARTITION ? 0 : x)
+
+#define fpriv_to_prof_mgr(fpriv) (&fpriv->userq_mgr.adev->prof_mgr)
+
+#define fpriv_to_adev(fpriv) fpriv->userq_mgr.adev
+
+#define prof_mgr_to_adev(x) \
+ container_of(x, struct amdgpu_device, prof_mgr)
+
+#define to_prof_xcp_mgr(x, y) \
+ container_of(x, struct amdgpu_profiler_xcp_mgr, y)
+
+#define xcp_to_prof_mgr(x, y) \
+ container_of(x, struct amdgpu_profiler_mgr, y)
+
+#define mgr_to_adev(x, y) \
+({ struct amdgpu_profiler_xcp_mgr *prof_xcp_mgr = to_prof_xcp_mgr(x, y); \
+ struct amdgpu_profiler_mgr *prof_mgr = \
+ xcp_to_prof_mgr(prof_xcp_mgr,
prof_xcp_mgr[prof_xcp_mgr->xcp_id]);\
+ prof_mgr_to_adev(prof_mgr); })
+
+struct amdgpu_profiler_xcp_mgr {
+ struct mutex mutex;
+ uint32_t xcp_id;
+ bool is_init;
+ struct kref ref;
+};
+
+struct amdgpu_profiler_mgr {
+ struct amdgpu_profiler_xcp_mgr prof_xcp_mgr[MAX_XCP];
+};
+
+int amdgpu_profiler_ioctl(struct drm_device *dev, void __user *data,
+ struct drm_file *filp);
+int amdgpu_profiler_mgr_init(struct amdgpu_profiler_mgr *prof_mgr,
+ struct amdgpu_fpriv *fpriv);
+void amdgpu_profiler_mgr_fini(struct amdgpu_profiler_mgr *prof_mgr,
+ struct amdgpu_fpriv *fpriv);
+
+#endif /* AMDGPU_PROFILER_H_ */
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 1a961f62724e..5d8439174fd0 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -58,6 +58,7 @@ extern "C" {
#define DRM_AMDGPU_USERQ_SIGNAL 0x17
#define DRM_AMDGPU_USERQ_WAIT 0x18
#define DRM_AMDGPU_GEM_LIST_HANDLES 0x19
+#define DRM_AMDGPU_PROFILER 0x20
#define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
#define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -79,6 +80,7 @@ extern "C" {
#define DRM_IOCTL_AMDGPU_USERQ_SIGNAL DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_USERQ_SIGNAL, struct drm_amdgpu_userq_signal)
#define DRM_IOCTL_AMDGPU_USERQ_WAIT DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait)
#define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)
+#define DRM_IOCTL_AMDGPU_PROFILER DRM_IOWR(DRM_COMMAND_BASE +
DRM_AMDGPU_PROFILER, struct drm_amdgpu_profiler_args)
/**
* DOC: memory domains
@@ -1708,6 +1710,23 @@ struct drm_color_ctm_3x4 {
__u64 matrix[12];
};
+/*
+ * Supported Profiler Operations
+ */
+enum drm_amdgpu_profiler_ops {
+ AMDGPU_PROFILER_VERSION = 0,
+};
+
+struct drm_amdgpu_profiler_args {
+ __u32 op; /* amdgpu_profiler_op */
+ union {
+ __u32 version; /* AMDGPU_PROFILER_VERSION_NUM
+ * lower 16 bit: minor
+ * higher 16 bit: major
+ */
+ };
+};
+
#if defined(__cplusplus)
}
#endif
--
2.34.1
