From e594972dd7cb5d54011d21cc536d1eef761bd2e9 Mon Sep 17 00:00:00 2001 From: Mikko Perttunen Date: Mon, 15 Apr 2024 10:47:34 +0300 Subject: [PATCH] drm/tegra: virt: Fix nvenc usage measurement Communication with BPMP attempted to use 'msenc' as engine name. Correct this to use 'nvenc' while keeping userspace debugfs directory as 'msenc'. Bug 4559545 Signed-off-by: Mikko Perttunen Change-Id: I4fef852dd3312c763c5845bf8b43fac082863bad Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3141443 (cherry picked from commit f2543128b14fb5df7764df7bfa3456bf0df4f945) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3193472 Reviewed-by: Santosh BS GVS: buildbot_gerritrpt --- drivers/gpu/drm/tegra/virt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tegra/virt.c b/drivers/gpu/drm/tegra/virt.c index f10bceee..d6edc16b 100644 --- a/drivers/gpu/drm/tegra/virt.c +++ b/drivers/gpu/drm/tegra/virt.c @@ -502,21 +502,26 @@ DEFINE_SHOW_ATTRIBUTE(actmon_debugfs_usage); static void virt_engine_setup_actmon_debugfs(struct virt_engine *virt) { + const char *dir; + switch (virt->client.base.class) { case HOST1X_CLASS_VIC: virt->name = "vic"; + dir = "vic"; break; case HOST1X_CLASS_NVENC: - virt->name = "msenc"; + virt->name = "nvenc"; + dir = "msenc"; break; case HOST1X_CLASS_NVDEC: virt->name = "nvdec"; + dir = "nvdec"; break; default: return; } - virt->actmon_debugfs_dir = debugfs_create_dir(virt->name, NULL); + virt->actmon_debugfs_dir = debugfs_create_dir(dir, NULL); debugfs_create_file("usage", S_IRUGO, virt->actmon_debugfs_dir, virt, &actmon_debugfs_usage_fops); }