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

diff --git a/drivers/accel/drm_accel.c b/drivers/accel/drm_accel.c
index 4a9baf02439e42e5c0d226885dce5f87514a223c..01edf2c00b5ad5f3069ec92badc37748ffcc023b 100644 (file)
--- 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 2de43ff3ce0a4305714c854cde1364db6e5e34e0..d90d0827bfad98251d38a22b2e10163523335392 100644 (file)
--- 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) {