The released out-of-tree amdxdna driver uses amdxdna_accel_driver as the drm-engine key string, which is consumed by several applications.
Use the same key string in the upstream driver to maintain compatibility with the out-of-tree driver. Reported-by: Umio Yasuno <[email protected]> Closes: https://github.com/amd/xdna-driver/issues/1754 Fixes: 489a8539ca6f ("accel/amdxdna: Expose NPU device busy time via DRM fdinfo") Signed-off-by: Max Zhen <[email protected]> --- Documentation/accel/amdxdna/amdnpu.rst | 2 +- drivers/accel/amdxdna/amdxdna_pci_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/accel/amdxdna/amdnpu.rst b/Documentation/accel/amdxdna/amdnpu.rst index d72af1b51ccf..b0cc481c73ae 100644 --- a/Documentation/accel/amdxdna/amdnpu.rst +++ b/Documentation/accel/amdxdna/amdnpu.rst @@ -289,7 +289,7 @@ Example of the output showing the implemented key value pairs: drm-driver: amdxdna_accel_driver drm-client-id: 3219 drm-pdev: 0000:c5:00.1 - drm-engine-npu: 14003870 ns + drm-engine-amdxdna_accel_driver: 14003870 ns amdxdna_accel_driver-heap-alloc: 60 KiB amdxdna_accel_driver-internal-alloc: 67588 KiB amdxdna_accel_driver-external-alloc: 0 diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c index edf807c93144..f233eb70a295 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.c +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c @@ -284,9 +284,9 @@ static void amdxdna_show_fdinfo(struct drm_printer *p, struct drm_file *filp) { struct amdxdna_client *client = filp->driver_priv; size_t heap_usage, external_usage, internal_usage; - char *drv_name = filp->minor->dev->driver->name; + char *drv_name = "amdxdna_accel_driver"; - drm_printf(p, "drm-engine-npu:\t%llu ns\n", + drm_printf(p, "drm-engine-%s:\t%llu ns\n", drv_name, amdxdna_io_stats_busy_time_ns(client)); mutex_lock(&client->mm_lock); -- 2.34.1
