summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <ckoenig.leichtzumerken@gmail.com>2023-08-29 14:01:11 +0300
committerChristian König <christian.koenig@amd.com>2023-08-31 18:00:10 +0300
commite76e7ec8f16259ff9167ab665eaee0d0fe20f805 (patch)
treea80c7edb4be6d3fe06e7698fdfa22c4f98db46ff
parenta5bb8a64025b4457ead9f588933536795c210f35 (diff)
downloadlinux-e76e7ec8f16259ff9167ab665eaee0d0fe20f805.tar.xz
drm/debugfs: drop debugfs_init() for the render and accel node v2
We want to remove per minor debugfs directories. Start by stopping drivers from adding anything inside of those in the mid layer callback. v2: drop it for the accel node as well Signed-off-by: Christian König <christian.koenig@amd.com> Tested-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230829110115.3442-2-christian.koenig@amd.com
-rw-r--r--drivers/accel/drm_accel.c3
-rw-r--r--drivers/gpu/drm/drm_debugfs.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/accel/drm_accel.c b/drivers/accel/drm_accel.c
index 4a9baf02439e..01edf2c00b5a 100644
--- a/drivers/accel/drm_accel.c
+++ b/drivers/accel/drm_accel.c
@@ -99,9 +99,6 @@ void accel_debugfs_init(struct drm_minor *minor, int minor_id)
drm_debugfs_create_files(accel_debugfs_list, ACCEL_DEBUGFS_ENTRIES,
minor->debugfs_root, minor);
-
- if (dev->driver->debugfs_init)
- dev->driver->debugfs_init(minor);
}
/**
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 2de43ff3ce0a..d90d0827bfad 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -284,7 +284,7 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
drm_client_debugfs_init(minor);
}
- if (dev->driver->debugfs_init)
+ if (dev->driver->debugfs_init && dev->render != minor)
dev->driver->debugfs_init(minor);
list_for_each_entry_safe(entry, tmp, &dev->debugfs_list, list) {