There is no way to tell how much of the NPU a client uses. Implement the DRM usage stats: report the runtime of the client's scheduler entity as drm-engine-npu, along with drm_show_memory_stats() for the BOs.
The cores are identical, so they are reported as a single engine with drm-engine-capacity-npu set to rdev->max_cores, the number of core slots. Document the keys in the rocket driver documentation. Signed-off-by: Sidong Yang <[email protected]> --- Documentation/accel/rocket/index.rst | 28 +++++++++++++++++++++++++++ Documentation/gpu/drm-usage-stats.rst | 1 + drivers/accel/rocket/rocket_drv.c | 21 +++++++++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/Documentation/accel/rocket/index.rst b/Documentation/accel/rocket/index.rst index 70f97bccf100..8ae785b65a53 100644 --- a/Documentation/accel/rocket/index.rst +++ b/Documentation/accel/rocket/index.rst @@ -17,3 +17,31 @@ project. Hardware currently supported: * RK3588 + +.. _rocket-usage-stats: + +Rocket DRM client usage stats implementation +============================================ + +The accel/rocket driver implements the DRM client usage stats specification as +documented in :ref:`drm-client-usage-stats`. + +The NPU cores are reported as a single engine, npu, with a capacity equal to the +number of cores. The time is summed over all cores and is accounted by the DRM +GPU scheduler, from when a job is handed to a core until its fence signals. + +Example of the output showing the implemented key value pairs: + +:: + + pos: 0 + flags: 02400002 + mnt_id: 33 + ino: 755 + drm-driver: rocket + drm-client-id: 263 + drm-engine-npu: 2384122043 ns + drm-engine-capacity-npu: 3 + drm-total-memory: 24216 KiB + drm-shared-memory: 0 + drm-active-memory: 3000 KiB diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst index 70b7cfcc194f..288764730d23 100644 --- a/Documentation/gpu/drm-usage-stats.rst +++ b/Documentation/gpu/drm-usage-stats.rst @@ -218,3 +218,4 @@ Driver specific implementations * :ref:`panthor-usage-stats` * :ref:`xe-usage-stats` * :ref:`amdxdna-usage-stats` +* :ref:`rocket-usage-stats` diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c index 5d7805c41dc3..351be60b1228 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -3,8 +3,10 @@ #include <drm/drm_accel.h> #include <drm/drm_drv.h> +#include <drm/drm_file.h> #include <drm/drm_gem.h> #include <drm/drm_ioctl.h> +#include <drm/drm_print.h> #include <drm/rocket_accel.h> #include <linux/clk.h> #include <linux/err.h> @@ -139,7 +141,23 @@ static const struct drm_ioctl_desc rocket_drm_driver_ioctls[] = { ROCKET_IOCTL(FINI_BO, fini_bo), }; -DEFINE_DRM_ACCEL_FOPS(rocket_accel_driver_fops); +static void rocket_show_fdinfo(struct drm_printer *p, struct drm_file *file) +{ + struct rocket_device *rdev = to_rocket_device(file->minor->dev); + struct rocket_file_priv *rocket_priv = file->driver_priv; + + drm_printf(p, "drm-engine-npu:\t%llu ns\n", + drm_sched_entity_get_runtime(&rocket_priv->sched_entity)); + drm_printf(p, "drm-engine-capacity-npu:\t%u\n", rdev->max_cores); + + drm_show_memory_stats(p, file); +} + +static const struct file_operations rocket_accel_driver_fops = { + .owner = THIS_MODULE, + DRM_ACCEL_FOPS, + .show_fdinfo = drm_show_fdinfo, +}; /* * Rocket driver version: @@ -150,6 +168,7 @@ static const struct drm_driver rocket_drm_driver = { .open = rocket_open, .postclose = rocket_postclose, .gem_create_object = rocket_gem_create_object, + .show_fdinfo = rocket_show_fdinfo, .ioctls = rocket_drm_driver_ioctls, .num_ioctls = ARRAY_SIZE(rocket_drm_driver_ioctls), .fops = &rocket_accel_driver_fops, -- 2.53.0
