DRM debugfs cleanup take 4
Subsystems (26)
Hi guys,
took me some tries to get the Intel CI happy with this patch set.
This is the version rebased on drm-misc-next, for a CI run you actually need to rebase the last patch to drm-tip. So I'm planning to merge 1-4 for this cycle and the last one after everything merged together again.
Please review,
Christian.
PATCH 1/5 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
--- drivers/accel/drm_accel.c | 3 --- drivers/gpu/drm/drm_debugfs.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/accel/drm_accel.c +0 -3
@@ -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); }/**
drivers/gpu/drm/drm_debugfs.c +1 -1
@@ -242,7 +242,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) {
Signature · 1 line
2.34.1
PATCH 2/5 drm/debugfs: rework debugfs directory creation v3
In reply to Christian KönigInstead of the per minor directories only create a single debugfs directory for the whole device directly when the device is initialized.
For DRM devices each minor gets a symlink to the per device directory for now until we can be sure that this isn't useful any more in any way.
Accel devices create only the per device directory and also drops the mid layer callback to create driver specific files.
v2: cleanup accel component as well
v3: fix typo when debugfs is disabled
--- drivers/accel/drm_accel.c | 27 ++++++++----- drivers/gpu/drm/drm_atomic.c | 4 +- drivers/gpu/drm/drm_client.c | 4 +- drivers/gpu/drm/drm_crtc_internal.h | 2 +- drivers/gpu/drm/drm_debugfs.c | 60 ++++++++++++++++++----------- drivers/gpu/drm/drm_drv.c | 18 +++++++-- drivers/gpu/drm/drm_framebuffer.c | 4 +- drivers/gpu/drm/drm_internal.h | 16 +++++--- include/drm/drm_accel.h | 9 ++++- include/drm/drm_client.h | 2 +- include/drm/drm_device.h | 7 ++++ include/drm/drm_drv.h | 8 ++++ include/drm/drm_file.h | 1 + 13 files changed, 110 insertions(+), 52 deletions(-)
drivers/accel/drm_accel.c +17 -10
@@ -79,26 +79,33 @@ static const struct drm_info_list accel_debugfs_list[] = {#define ACCEL_DEBUGFS_ENTRIES ARRAY_SIZE(accel_debugfs_list)/** -* accel_debugfs_init() - Initialize debugfs for accel minor +* accel_debugfs_init() - Register debugfs for accel minor +* @dev: Pointer to the device instance. +* +* This function creates a root directory for the device in debugfs. +*/ +void accel_debugfs_init (struct drm_device *dev) +{ +drm_debugfs_dev_init (dev, accel_debugfs_root); +} + +/** +* accel_debugfs_register() - Register debugfs for device * @minor: Pointer to the drm_minor instance. * @minor_id: The minor's id * -* This function initializes the drm minor's debugfs members and creates -* a root directory for the minor in debugfs. It also creates common files -* for accelerators and calls the driver's debugfs init callback. +* Creates common files for accelerators. */ -void accel_debugfs_init (struct drm_minor *minor,int minor_id) +void accel_debugfs_register (struct drm_device *dev) { -struct drm_device *dev = minor->dev; -char name[64 ]; +struct drm_minor *minor = dev->accel;INIT_LIST_HEAD (&minor->debugfs_list);mutex_init (&minor->debugfs_lock); -sprintf (name,"%d" , minor_id); - minor->debugfs_root =debugfs_create_dir (name, accel_debugfs_root); + minor->debugfs_root = dev->debugfs_root;drm_debugfs_create_files (accel_debugfs_list,ACCEL_DEBUGFS_ENTRIES , - minor->debugfs_root, minor); + dev->debugfs_root, minor); }/**
drivers/gpu/drm/drm_atomic.c +2 -2
@@ -1771,9 +1771,9 @@ static const struct drm_debugfs_info drm_atomic_debugfs_list[] = { {"state", drm_state_info, 0}, }; -void drm_atomic_debugfs_init(struct drm_minor *minor) +void drm_atomic_debugfs_init(struct drm_device *dev) { - drm_debugfs_add_files(minor->dev, drm_atomic_debugfs_list, + drm_debugfs_add_files(dev, drm_atomic_debugfs_list, ARRAY_SIZE(drm_atomic_debugfs_list)); } #endif
drivers/gpu/drm/drm_client.c +2 -2
@@ -514,9 +514,9 @@ static const struct drm_debugfs_info drm_client_debugfs_list[] = { { "internal_clients", drm_client_debugfs_internal_clients, 0 }, }; -void drm_client_debugfs_init(struct drm_minor *minor) +void drm_client_debugfs_init(struct drm_device *dev) { - drm_debugfs_add_files(minor->dev, drm_client_debugfs_list, + drm_debugfs_add_files(dev, drm_client_debugfs_list, ARRAY_SIZE(drm_client_debugfs_list)); } #endif
drivers/gpu/drm/drm_crtc_internal.h +1 -1
@@ -232,7 +232,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,/* drm_atomic.c */ #ifdef CONFIG_DEBUG_FS struct drm_minor ; -void drm_atomic_debugfs_init (struct drm_minor *minor); +void drm_atomic_debugfs_init (struct drm_device *dev);#endif int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
drivers/gpu/drm/drm_debugfs.c +37 -23
104 lines not on this page · raw message
drivers/gpu/drm/drm_drv.c +14 -4
@@ -172,10 +172,9 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)if (!minor)return 0 ; -if (minor->type ==DRM_MINOR_ACCEL ) { -accel_debugfs_init (minor, minor->index); - }else { - ret =drm_debugfs_init (minor, minor->index, drm_debugfs_root); +if (minor->type !=DRM_MINOR_ACCEL ) { + ret =drm_debugfs_register (minor, minor->index, + drm_debugfs_root);if (ret) {DRM_ERROR ("DRM: Failed to initialize /sys/kernel/debug/dri.\n" ); goto err_debugfs;
@@ -697,6 +696,11 @@ static int drm_dev_init(struct drm_device *dev, goto err; } +if (drm_core_check_feature (dev,DRIVER_COMPUTE_ACCEL )) +accel_debugfs_init (dev); +else +drm_debugfs_dev_init (dev, drm_debugfs_root); +return 0 ; err:
@@ -916,6 +920,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)if (drm_dev_needs_global_mutex (dev))mutex_lock (&drm_global_mutex); +if (drm_core_check_feature (dev,DRIVER_COMPUTE_ACCEL )) +accel_debugfs_register (dev); +else +drm_debugfs_dev_register (dev); + ret =drm_minor_register (dev,DRM_MINOR_RENDER );if (ret) goto err_minors;
@@ -999,6 +1008,7 @@ void drm_dev_unregister(struct drm_device *dev)drm_minor_unregister (dev,DRM_MINOR_ACCEL );drm_minor_unregister (dev,DRM_MINOR_PRIMARY );drm_minor_unregister (dev,DRM_MINOR_RENDER ); +drm_debugfs_dev_fini (dev); }EXPORT_SYMBOL (drm_dev_unregister);
drivers/gpu/drm/drm_framebuffer.c +2 -2
@@ -1222,9 +1222,9 @@ static const struct drm_debugfs_info drm_framebuffer_debugfs_list[] = { { "framebuffer", drm_framebuffer_info, 0 }, }; -void drm_framebuffer_debugfs_init(struct drm_minor *minor) +void drm_framebuffer_debugfs_init(struct drm_device *dev) { - drm_debugfs_add_files(minor->dev, drm_framebuffer_debugfs_list, + drm_debugfs_add_files(dev, drm_framebuffer_debugfs_list, ARRAY_SIZE(drm_framebuffer_debugfs_list)); } #endif
drivers/gpu/drm/drm_internal.h +11 -5
@@ -180,8 +180,10 @@ void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);/* drm_debugfs.c drm_debugfs_crc.c */ #if defined(CONFIG_DEBUG_FS ) -int drm_debugfs_init (struct drm_minor *minor,int minor_id, -struct dentry *root); +void drm_debugfs_dev_fini (struct drm_device *dev); +void drm_debugfs_dev_register (struct drm_device *dev); +int drm_debugfs_register (struct drm_minor *minor,int minor_id, +struct dentry *root);void drm_debugfs_cleanup (struct drm_minor *minor);void drm_debugfs_late_register (struct drm_device *dev);void drm_debugfs_connector_add (struct drm_connector *connector);
@@ -190,8 +192,12 @@ void drm_debugfs_crtc_add(struct drm_crtc *crtc);void drm_debugfs_crtc_remove (struct drm_crtc *crtc);void drm_debugfs_crtc_crc_add (struct drm_crtc *crtc);#else -static inline int drm_debugfs_init (struct drm_minor *minor,int minor_id, -struct dentry *root) +static inline void drm_debugfs_dev_register (struct drm_device *dev) +{ +} + +static inline int drm_debugfs_register (struct drm_minor *minor,int minor_id, +struct dentry *root) {return 0 ; }
@@ -257,4 +263,4 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data,/* drm_framebuffer.c */ void drm_framebuffer_print_info (struct drm_printer *p,unsigned int indent,const struct drm_framebuffer *fb); -void drm_framebuffer_debugfs_init (struct drm_minor *minor); +void drm_framebuffer_debugfs_init (struct drm_device *dev);
include/drm/drm_accel.h +7 -2
@@ -58,7 +58,8 @@ int accel_minor_alloc(void);void accel_minor_replace (struct drm_minor *minor,int index);void accel_set_device_instance_params (struct device *kdev,int index);int accel_open (struct inode *inode,struct file *filp); -void accel_debugfs_init (struct drm_minor *minor,int minor_id); +void accel_debugfs_init (struct drm_device *dev); +void accel_debugfs_register (struct drm_device *dev);#else
@@ -89,7 +90,11 @@ static inline void accel_set_device_instance_params(struct device *kdev, int ind { } -static inline void accel_debugfs_init (struct drm_minor *minor,int minor_id) +static inline void accel_debugfs_init (struct drm_device *dev) +{ +} + +static inline void accel_debugfs_register (struct drm_device *dev) { }
include/drm/drm_client.h +1 -1
@@ -195,6 +195,6 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode); drm_for_each_connector_iter(connector, iter) \if (connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) -void drm_client_debugfs_init(struct drm_minor *minor); +void drm_client_debugfs_init(struct drm_device *dev);#endif
include/drm/drm_device.h +7 -0
@@ -311,6 +311,13 @@ struct drm_device {*/ struct drm_fb_helper *fb_helper; +/** +* @debugfs_root: +* +* Root directory for debugfs files. +*/ +struct dentry *debugfs_root; +/** * @debugfs_mutex: *
include/drm/drm_drv.h +8 -0
@@ -590,4 +590,12 @@ static inline bool drm_firmware_drivers_only(void) return video_firmware_drivers_only(); } +#if defined(CONFIG_DEBUG_FS ) +void drm_debugfs_dev_init (struct drm_device *dev,struct dentry *root); +#else +static void drm_debugfs_dev_init (struct drm_device *dev,struct dentry *root) +{ +} +#endif +#endif
include/drm/drm_file.h +1 -0
@@ -78,6 +78,7 @@ struct drm_minor {struct device *kdev;/* Linux device */ struct drm_device *dev; +struct dentry *debugfs_symlink;struct dentry *debugfs_root;struct list_head debugfs_list;
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
kernel test robot noticed the following build errors:
Hi Christian,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on drm-intel/for-linux-next drm-intel/for-linux-next-fixes tegra/for-next linus/master v6.3-rc6 next-20230412] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-K-nig/drm-debugfs-rework-debugfs-directory-creation-v3/20230412-235231 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230412145206.2483-3-christian.koenig%40amd.com patch subject: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3 config: arc-randconfig-r043-20230413 (https://download.01.org/0day-ci/archive/20230413/[email protected]/config) compiler: arceb-elf-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/92a7a4f0fd59d427c5827c323692b76095f90efc
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Christian-K-nig/drm-debugfs-rework-debugfs-directory-creation-v3/20230412-235231 git checkout 92a7a4f0fd59d427c5827c323692b76095f90efc
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/gpu/drm/drm_drv.c: In function 'drm_dev_unregister':
>> drivers/gpu/drm/drm_drv.c:1011:9: error: implicit declaration of function 'drm_debugfs_dev_fini'; did you mean 'drm_debugfs_dev_init'? [-Werror=implicit-function-declaration]
1011 | drm_debugfs_dev_fini(dev);
| ^~~~~~~~~~~~~~~~~~~~
| drm_debugfs_dev_initcc1: some warnings being treated as errors
vim +1011 drivers/gpu/drm/drm_drv.c
974
975 /**
976 * drm_dev_unregister - Unregister DRM device
977 * @dev: Device to unregister
978 *
979 * Unregister the DRM device from the system. This does the reverse of
980 * drm_dev_register() but does not deallocate the device. The caller must call
981 * drm_dev_put() to drop their final reference.
982 *
983 * A special form of unregistering for hotpluggable devices is drm_dev_unplug(),
984 * which can be called while there are still open users of @dev.
985 *
986 * This should be called first in the device teardown code to make sure
987 * userspace can't access the device instance any more.
988 */
989 void drm_dev_unregister(struct drm_device *dev)
990 {
991 if (drm_core_check_feature(dev, DRIVER_LEGACY))
992 drm_lastclose(dev);
993
994 dev->registered = false;
995
996 drm_client_dev_unregister(dev);
997
998 if (drm_core_check_feature(dev, DRIVER_MODESET))
999 drm_modeset_unregister_all(dev);
1000
1001 if (dev->driver->unload)
1002 dev->driver->unload(dev);
1003
1004 drm_legacy_pci_agp_destroy(dev);
1005 drm_legacy_rmmaps(dev);
1006
1007 remove_compat_control_link(dev);
1008 drm_minor_unregister(dev, DRM_MINOR_ACCEL);
1009 drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
1010 drm_minor_unregister(dev, DRM_MINOR_RENDER);
> 1011 drm_debugfs_dev_fini(dev);
1012 }
1013 EXPORT_SYMBOL(drm_dev_unregister);
1014
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botRe: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
In reply to Christian Königkernel test robot noticed the following build errors:
Hi Christian,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on drm-intel/for-linux-next drm-intel/for-linux-next-fixes tegra/for-next linus/master v6.3-rc6 next-20230412] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-K-nig/drm-debugfs-rework-debugfs-directory-creation-v3/20230412-235231 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230412145206.2483-3-christian.koenig%40amd.com patch subject: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3 config: hexagon-randconfig-r002-20230409 (https://download.01.org/0day-ci/archive/20230413/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 9638da200e00bd069e6dd63604e14cbafede9324)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/92a7a4f0fd59d427c5827c323692b76095f90efc
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Christian-K-nig/drm-debugfs-rework-debugfs-directory-creation-v3/20230412-235231 git checkout 92a7a4f0fd59d427c5827c323692b76095f90efc
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/drm_drv.c:38:
In file included from include/drm/drm_accel.h:11:
In file included from include/drm/drm_file.h:39:
In file included from include/drm/drm_prime.h:37:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __raw_readb(PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
#define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
^
In file included from drivers/gpu/drm/drm_drv.c:38:
In file included from include/drm/drm_accel.h:11:
In file included from include/drm/drm_file.h:39:
In file included from include/drm/drm_prime.h:37:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
^
In file included from drivers/gpu/drm/drm_drv.c:38:
In file included from include/drm/drm_accel.h:11:
In file included from include/drm/drm_file.h:39:
In file included from include/drm/drm_prime.h:37:
In file included from include/linux/scatterlist.h:9:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writeb(value, PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
>> drivers/gpu/drm/drm_drv.c:1011:2: error: call to undeclared function 'drm_debugfs_dev_fini'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
drm_debugfs_dev_fini(dev);
^
drivers/gpu/drm/drm_drv.c:1011:2: note: did you mean 'drm_debugfs_dev_init'?
include/drm/drm_drv.h:596:13: note: 'drm_debugfs_dev_init' declared here
static void drm_debugfs_dev_init(struct drm_device *dev, struct dentry *root)
^6 warnings and 1 error generated.
vim +/drm_debugfs_dev_fini +1011 drivers/gpu/drm/drm_drv.c
974
975 /**
976 * drm_dev_unregister - Unregister DRM device
977 * @dev: Device to unregister
978 *
979 * Unregister the DRM device from the system. This does the reverse of
980 * drm_dev_register() but does not deallocate the device. The caller must call
981 * drm_dev_put() to drop their final reference.
982 *
983 * A special form of unregistering for hotpluggable devices is drm_dev_unplug(),
984 * which can be called while there are still open users of @dev.
985 *
986 * This should be called first in the device teardown code to make sure
987 * userspace can't access the device instance any more.
988 */
989 void drm_dev_unregister(struct drm_device *dev)
990 {
991 if (drm_core_check_feature(dev, DRIVER_LEGACY))
992 drm_lastclose(dev);
993
994 dev->registered = false;
995
996 drm_client_dev_unregister(dev);
997
998 if (drm_core_check_feature(dev, DRIVER_MODESET))
999 drm_modeset_unregister_all(dev);
1000
1001 if (dev->driver->unload)
1002 dev->driver->unload(dev);
1003
1004 drm_legacy_pci_agp_destroy(dev);
1005 drm_legacy_rmmaps(dev);
1006
1007 remove_compat_control_link(dev);
1008 drm_minor_unregister(dev, DRM_MINOR_ACCEL);
1009 drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
1010 drm_minor_unregister(dev, DRM_MINOR_RENDER);
> 1011 drm_debugfs_dev_fini(dev);
1012 }
1013 EXPORT_SYMBOL(drm_dev_unregister);
1014
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Re: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
In reply to Christian KönigQuoted 15 lines · Christian König
/**
- *accel_debugfs_init()- Initialize debugfs for accel minor
+ *accel_debugfs_init()- Register debugfs for accel minor
+ * @dev: Pointer to the device instance.
+ *
+ * This function creates a root directory for the device in debugfs.
+ */drivers/accel/drm_accel.c +7
-0+void accel_debugfs_init (struct drm_device *dev) +{ +drm_debugfs_dev_init (dev, accel_debugfs_root); +} + +/** +* accel_debugfs_register() - Register debugfs for device * @minor: Pointer to the drm_minor instance.
drivers/accel/drm_accel.c static const struct drm_info_list accel_debugfs_list[] = { · line 100
Quoted 10 lines
drivers/accel/drm_accel.c +2
-4* @minor_id: The minor's id * -* This function initializes the drm minor's debugfs members and creates -* a root directory for the minor in debugfs. It also creates common files -* for accelerators and calls the driver's debugfs init callback. +* Creates common files for accelerators. */ -void accel_debugfs_init (struct drm_minor *minor,int minor_id) +void accel_debugfs_register (struct drm_device *dev) {
Maybe the accel_debugfs_init() description should now be "Initialize debugfs for device"?
Re: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
Am 16.04.23 um 18:03 schrieb Tomer Tayar:
Quoted 20 lines · Christian König
Quoted 19 lines
/**- *
accel_debugfs_init()- Initialize debugfs for accel minor
+ *accel_debugfs_init()- Register debugfs for accel minor
+ * @dev: Pointer to the device instance.
+ *
+ * This function creates a root directory for the device in debugfs.
+ */drivers/accel/drm_accel.c +7
-2+void accel_debugfs_init (struct drm_device *dev) +{ +drm_debugfs_dev_init (dev, accel_debugfs_root); +} + +/** +* accel_debugfs_register() - Register debugfs for device * @minor: Pointer to the drm_minor instance. * @minor_id: The minor's id * -* This function initializes the drm minor's debugfs members and creates -* a root directory for the minor in debugfs. It also creates common files
Quoted 8 lines
drivers/accel/drm_accel.c static const struct drm_info_list accel_debugfs_list[] = { · line 100
Quoted 6 lines
- * for accelerators and calls the driver's debugfs init callback.
+ * Creates common files for accelerators.*/drivers/accel/drm_accel.c +1
-1-void accel_debugfs_init (struct drm_minor *minor,int minor_id) +void accel_debugfs_register (struct drm_device *dev) {Maybe the
accel_debugfs_init()description should now be "Initialize debugfs for device"?
Good point, going to adjust that as well.
Thanks,
Christian.
Re: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
Quoted 21 lines · Christian König
Am 16.04.23 um 18:03 schrieb Tomer Tayar:
Quoted 18 lines · Christian König
Quoted 17 lines
/**- *
accel_debugfs_init()- Initialize debugfs for accel minor
+ *accel_debugfs_init()- Register debugfs for accel minor
+ * @dev: Pointer to the device instance.
+ *
+ * This function creates a root directory for the device in debugfs.
+ */drivers/accel/drm_accel.c +7
-0+void accel_debugfs_init (struct drm_device *dev) +{ +drm_debugfs_dev_init (dev, accel_debugfs_root); +} + +/** +* accel_debugfs_register() - Register debugfs for device * @minor: Pointer to the drm_minor instance. * @minor_id: The minor's id *
Quoted 8 lines
Quoted 8 lines
drivers/accel/drm_accel.c static const struct drm_info_list accel_debugfs_list[] = { · line 100
Quoted 8 lines
- * This function initializes the drm minor's debugfs members and creates
- * a root directory for the minor in debugfs. It also creates common files
- * for accelerators and calls the driver's debugfs init callback.
+ * Creates common files for accelerators.*/drivers/accel/drm_accel.c +1
-1-void accel_debugfs_init (struct drm_minor *minor,int minor_id) +void accel_debugfs_register (struct drm_device *dev) {
I wonder if we need this and can not use drm_debugfs_dev_register() ? In drm there are two additional files "clients" and "gem_names" which are appropriate to accel as well and so far we do not have any accel specific files.
Regards
Stanislaw
Re: [PATCH 2/5] drm/debugfs: rework debugfs directory creation v3
Am 17.04.23 um 12:26 schrieb Stanislaw Gruszka:
Quoted 25 lines · Christian König
Quoted 24 lines
Am 16.04.23 um 18:03 schrieb Tomer Tayar:
Quoted 22 lines · Christian König
Quoted 21 lines
/**- *
accel_debugfs_init()- Initialize debugfs for accel minor
+ *accel_debugfs_init()- Register debugfs for accel minor
+ * @dev: Pointer to the device instance.
+ *
+ * This function creates a root directory for the device in debugfs.
+ */drivers/accel/drm_accel.c +8
-3+void accel_debugfs_init (struct drm_device *dev) +{ +drm_debugfs_dev_init (dev, accel_debugfs_root); +} + +/** +* accel_debugfs_register() - Register debugfs for device * @minor: Pointer to the drm_minor instance. * @minor_id: The minor's id * -* This function initializes the drm minor's debugfs members and creates -* a root directory for the minor in debugfs. It also creates common files -* for accelerators and calls the driver's debugfs init callback. +* Creates common files for accelerators.
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
drivers/accel/drm_accel.c static const struct drm_info_list accel_debugfs_list[] = { · line 100
Quoted 4 lines
*/drivers/accel/drm_accel.c +1
-1-void accel_debugfs_init (struct drm_minor *minor,int minor_id) +void accel_debugfs_register (struct drm_device *dev) {I wonder if we need this and can not use
drm_debugfs_dev_register()? In drm there are two additional files "clients" and "gem_names" which are appropriate to accel as well and so far we do not have any accel specific files.
I was wondering the same thing while going over this, but then decided to leave it as it is for now.
My primary concern is to remove the mid layering with the driver callback because that is blocking functionality from working correctly, cleanup and re-joining of functionality can then come later on.
Regards,
Christian.
Quoted 3 lines
Regards
Stanislaw
PATCH 3/5 drm/debugfs: remove dev->debugfs_list and debugfs_mutex v2
In reply to Christian KönigThe mutex was completely pointless in the first place since any parallel adding of files to this list would result in random behavior since the list is filled and consumed multiple times.
Completely drop that approach and just create the files directly but return -ENODEV while opening the file when the minors are not registered yet.
v2: rebase on debugfs directory rework, limit access before minors are
registered.
--- drivers/gpu/drm/drm_debugfs.c | 27 ++------------------------- drivers/gpu/drm/drm_drv.c | 3 --- drivers/gpu/drm/drm_internal.h | 5 ----- drivers/gpu/drm/drm_mode_config.c | 2 -- include/drm/drm_device.h | 15 --------------- 5 files changed, 2 insertions(+), 50 deletions(-)
drivers/gpu/drm/drm_debugfs.c +2 -25
@@ -245,7 +245,6 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id, struct dentry *root) {struct drm_device *dev = minor->dev; -struct drm_debugfs_entry *entry, *tmp;char name[64 ];INIT_LIST_HEAD (&minor->debugfs_list);
@@ -260,30 +259,9 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id,if (dev->driver->debugfs_init && dev->render != minor) dev->driver->debugfs_init (minor); -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -return 0 ; } -void drm_debugfs_late_register (struct drm_device *dev) -{ -struct drm_minor *minor = dev->primary; -struct drm_debugfs_entry *entry, *tmp; - -if (!minor) -return ; - -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -} -int drm_debugfs_remove_files (const struct drm_info_list *files,int count,struct drm_minor *minor) {
@@ -353,9 +331,8 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name, entry->file.data = data; entry->dev = dev; -mutex_lock (&dev->debugfs_mutex); -list_add (&entry->list, &dev->debugfs_list); -mutex_unlock (&dev->debugfs_mutex); +debugfs_create_file (name,0444 , dev->debugfs_root, entry, + &drm_debugfs_entry_fops); }EXPORT_SYMBOL (drm_debugfs_add_file);
drivers/gpu/drm/drm_drv.c +0 -3
@@ -597,7 +597,6 @@ static void drm_dev_init_release(struct drm_device *dev, void *res)mutex_destroy (&dev->clientlist_mutex);mutex_destroy (&dev->filelist_mutex);mutex_destroy (&dev->struct_mutex); -mutex_destroy (&dev->debugfs_mutex);drm_legacy_destroy_members (dev); }
@@ -638,14 +637,12 @@ static int drm_dev_init(struct drm_device *dev,INIT_LIST_HEAD (&dev->filelist_internal);INIT_LIST_HEAD (&dev->clientlist);INIT_LIST_HEAD (&dev->vblank_event_list); -INIT_LIST_HEAD (&dev->debugfs_list);spin_lock_init (&dev->event_lock);mutex_init (&dev->struct_mutex);mutex_init (&dev->filelist_mutex);mutex_init (&dev->clientlist_mutex);mutex_init (&dev->master_mutex); -mutex_init (&dev->debugfs_mutex); ret =drmm_add_action_or_reset (dev, drm_dev_init_release,NULL );if (ret)
drivers/gpu/drm/drm_internal.h +0 -5
@@ -185,7 +185,6 @@ void drm_debugfs_dev_register(struct drm_device *dev);int drm_debugfs_register (struct drm_minor *minor,int minor_id,struct dentry *root);void drm_debugfs_cleanup (struct drm_minor *minor); -void drm_debugfs_late_register (struct drm_device *dev);void drm_debugfs_connector_add (struct drm_connector *connector);void drm_debugfs_connector_remove (struct drm_connector *connector);void drm_debugfs_crtc_add (struct drm_crtc *crtc);
@@ -206,10 +205,6 @@ static inline void drm_debugfs_cleanup(struct drm_minor *minor) { } -static inline void drm_debugfs_late_register (struct drm_device *dev) -{ -} -static inline void drm_debugfs_connector_add (struct drm_connector *connector) { }
drivers/gpu/drm/drm_mode_config.c +0 -2
@@ -54,8 +54,6 @@ int drm_modeset_register_all(struct drm_device *dev)if (ret) goto err_connector; -drm_debugfs_late_register (dev); -return 0 ; err_connector:
include/drm/drm_device.h +0 -15
@@ -318,21 +318,6 @@ struct drm_device {*/ struct dentry *debugfs_root; -/** -* @debugfs_mutex: -* -* Protects &debugfs_list access. -*/ -struct mutex debugfs_mutex; - -/** -* @debugfs_list: -* -* List of debugfs files to be created by the DRM device. The files -* must be added during drm_dev_register(). -*/ -struct list_head debugfs_list; -/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY )
Signature · 1 line
2.34.1
Re: [PATCH 3/5] drm/debugfs: remove dev->debugfs_list and debugfs_mutex v2
Quoted 7 lines · Christian König
The mutex was completely pointless in the first place since any parallel adding of files to this list would result in random behavior since the list is filled and consumed multiple times.
Completely drop that approach and just create the files directly but return
-ENODEVwhile opening the file when the minors are not registered yet.
This part seems to be missing?
The other issue is that partial driver load cleanup now goes boom I think, you need to both remove them all in _unregister but also in final drm_dev cleanup. Or I'm missing how this works. Maybe you could also use drmm_ for that to make sure it's always done.
There shouldn't be a race as long as the "are we registered yet" check is there, since in that case the driver never registered. So no problems trying to access the files when they could try to access things which are already cleaned up.
I think with those details ironed out this makes some sense to me, assuming I understood it correctly.
Quoted 160 lines
v2: rebase on debugfs directory rework, limit access before minors are
registered.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/drm_debugfs.c | 27 ++------------------------- drivers/gpu/drm/drm_drv.c | 3 --- drivers/gpu/drm/drm_internal.h | 5 ----- drivers/gpu/drm/drm_mode_config.c | 2 -- include/drm/drm_device.h | 15 --------------- 5 files changed, 2 insertions(+), 50 deletions(-)drivers/gpu/drm/drm_debugfs.c +2
-25@@ -245,7 +245,6 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id, struct dentry *root) {struct drm_device *dev = minor->dev; -struct drm_debugfs_entry *entry, *tmp;char name[64 ];INIT_LIST_HEAD (&minor->debugfs_list);@@ -260,30 +259,9 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id,if (dev->driver->debugfs_init && dev->render != minor) dev->driver->debugfs_init (minor); -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -return 0 ; } -void drm_debugfs_late_register (struct drm_device *dev) -{ -struct drm_minor *minor = dev->primary; -struct drm_debugfs_entry *entry, *tmp; - -if (!minor) -return ; - -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -} -int drm_debugfs_remove_files (const struct drm_info_list *files,int count,struct drm_minor *minor) {@@ -353,9 +331,8 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name, entry->file.data = data; entry->dev = dev; -mutex_lock (&dev->debugfs_mutex); -list_add (&entry->list, &dev->debugfs_list); -mutex_unlock (&dev->debugfs_mutex); +debugfs_create_file (name,0444 , dev->debugfs_root, entry, + &drm_debugfs_entry_fops); }EXPORT_SYMBOL (drm_debugfs_add_file);drivers/gpu/drm/drm_drv.c +0
-3@@ -597,7 +597,6 @@ static void drm_dev_init_release(struct drm_device *dev, void *res)mutex_destroy (&dev->clientlist_mutex);mutex_destroy (&dev->filelist_mutex);mutex_destroy (&dev->struct_mutex); -mutex_destroy (&dev->debugfs_mutex);drm_legacy_destroy_members (dev); }@@ -638,14 +637,12 @@ static int drm_dev_init(struct drm_device *dev,INIT_LIST_HEAD (&dev->filelist_internal);INIT_LIST_HEAD (&dev->clientlist);INIT_LIST_HEAD (&dev->vblank_event_list); -INIT_LIST_HEAD (&dev->debugfs_list);spin_lock_init (&dev->event_lock);mutex_init (&dev->struct_mutex);mutex_init (&dev->filelist_mutex);mutex_init (&dev->clientlist_mutex);mutex_init (&dev->master_mutex); -mutex_init (&dev->debugfs_mutex); ret =drmm_add_action_or_reset (dev, drm_dev_init_release,NULL );if (ret)drivers/gpu/drm/drm_internal.h +0
-5@@ -185,7 +185,6 @@ void drm_debugfs_dev_register(struct drm_device *dev);int drm_debugfs_register (struct drm_minor *minor,int minor_id,struct dentry *root);void drm_debugfs_cleanup (struct drm_minor *minor); -void drm_debugfs_late_register (struct drm_device *dev);void drm_debugfs_connector_add (struct drm_connector *connector);void drm_debugfs_connector_remove (struct drm_connector *connector);void drm_debugfs_crtc_add (struct drm_crtc *crtc);@@ -206,10 +205,6 @@ static inline void drm_debugfs_cleanup(struct drm_minor *minor) { } -static inline void drm_debugfs_late_register (struct drm_device *dev) -{ -} -static inline void drm_debugfs_connector_add (struct drm_connector *connector) { }drivers/gpu/drm/drm_mode_config.c +0
-2@@ -54,8 +54,6 @@ int drm_modeset_register_all(struct drm_device *dev)if (ret) goto err_connector; -drm_debugfs_late_register (dev); -return 0 ; err_connector:include/drm/drm_device.h +0
-15@@ -318,21 +318,6 @@ struct drm_device {*/ struct dentry *debugfs_root; -/** -* @debugfs_mutex: -* -* Protects &debugfs_list access. -*/ -struct mutex debugfs_mutex; - -/** -* @debugfs_list: -* -* List of debugfs files to be created by the DRM device. The files -* must be added during drm_dev_register(). -*/ -struct list_head debugfs_list; -/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY )Signature · 1 line
2.34.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 3/5] drm/debugfs: remove dev->debugfs_list and debugfs_mutex v2
Am 12.04.23 um 17:11 schrieb Daniel Vetter:
Quoted 9 lines · Christian König
Quoted 7 lines
The mutex was completely pointless in the first place since any parallel adding of files to this list would result in random behavior since the list is filled and consumed multiple times.
Completely drop that approach and just create the files directly but return
-ENODEVwhile opening the file when the minors are not registered yet.This part seems to be missing?
I wanted to move this into a separate patch and then forgot to add it. Going to fix that.
Quoted 4 lines
The other issue is that partial driver load cleanup now goes boom I think, you need to both remove them all in
_unregisterbut also in finaldrm_devcleanup. Or I'm missing how this works. Maybe you could also usedrmm_for that to make sure it's always done.
Good point. Should we call the cleanup function from both the unregister and the final drm_dev cleanup or just the later?
Thanks,
Christian.
Quoted 168 lines
There shouldn't be a race as long as the "are we registered yet" check is there, since in that case the driver never registered. So no problems trying to access the files when they could try to access things which are already cleaned up.
I think with those details ironed out this makes some sense to me, assuming I understood it correctly.
Quoted 159 lines
v2: rebase on debugfs directory rework, limit access before minors are
registered.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/drm_debugfs.c | 27 ++------------------------- drivers/gpu/drm/drm_drv.c | 3 --- drivers/gpu/drm/drm_internal.h | 5 ----- drivers/gpu/drm/drm_mode_config.c | 2 -- include/drm/drm_device.h | 15 --------------- 5 files changed, 2 insertions(+), 50 deletions(-)drivers/gpu/drm/drm_debugfs.c +2
-25@@ -245,7 +245,6 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id, struct dentry *root) {struct drm_device *dev = minor->dev; -struct drm_debugfs_entry *entry, *tmp;char name[64 ];INIT_LIST_HEAD (&minor->debugfs_list);@@ -260,30 +259,9 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id,if (dev->driver->debugfs_init && dev->render != minor) dev->driver->debugfs_init (minor); -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -return 0 ; } -void drm_debugfs_late_register (struct drm_device *dev) -{ -struct drm_minor *minor = dev->primary; -struct drm_debugfs_entry *entry, *tmp; - -if (!minor) -return ; - -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -} -int drm_debugfs_remove_files (const struct drm_info_list *files,int count,struct drm_minor *minor) {@@ -353,9 +331,8 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name, entry->file.data = data; entry->dev = dev; -mutex_lock (&dev->debugfs_mutex); -list_add (&entry->list, &dev->debugfs_list); -mutex_unlock (&dev->debugfs_mutex); +debugfs_create_file (name,0444 , dev->debugfs_root, entry, + &drm_debugfs_entry_fops); }EXPORT_SYMBOL (drm_debugfs_add_file);drivers/gpu/drm/drm_drv.c +0
-3@@ -597,7 +597,6 @@ static void drm_dev_init_release(struct drm_device *dev, void *res)mutex_destroy (&dev->clientlist_mutex);mutex_destroy (&dev->filelist_mutex);mutex_destroy (&dev->struct_mutex); -mutex_destroy (&dev->debugfs_mutex);drm_legacy_destroy_members (dev); }@@ -638,14 +637,12 @@ static int drm_dev_init(struct drm_device *dev,INIT_LIST_HEAD (&dev->filelist_internal);INIT_LIST_HEAD (&dev->clientlist);INIT_LIST_HEAD (&dev->vblank_event_list); -INIT_LIST_HEAD (&dev->debugfs_list);spin_lock_init (&dev->event_lock);mutex_init (&dev->struct_mutex);mutex_init (&dev->filelist_mutex);mutex_init (&dev->clientlist_mutex);mutex_init (&dev->master_mutex); -mutex_init (&dev->debugfs_mutex); ret =drmm_add_action_or_reset (dev, drm_dev_init_release,NULL );if (ret)drivers/gpu/drm/drm_internal.h +0
-5@@ -185,7 +185,6 @@ void drm_debugfs_dev_register(struct drm_device *dev);int drm_debugfs_register (struct drm_minor *minor,int minor_id,struct dentry *root);void drm_debugfs_cleanup (struct drm_minor *minor); -void drm_debugfs_late_register (struct drm_device *dev);void drm_debugfs_connector_add (struct drm_connector *connector);void drm_debugfs_connector_remove (struct drm_connector *connector);void drm_debugfs_crtc_add (struct drm_crtc *crtc);@@ -206,10 +205,6 @@ static inline void drm_debugfs_cleanup(struct drm_minor *minor) { } -static inline void drm_debugfs_late_register (struct drm_device *dev) -{ -} -static inline void drm_debugfs_connector_add (struct drm_connector *connector) { }drivers/gpu/drm/drm_mode_config.c +0
-2@@ -54,8 +54,6 @@ int drm_modeset_register_all(struct drm_device *dev)if (ret) goto err_connector; -drm_debugfs_late_register (dev); -return 0 ; err_connector:include/drm/drm_device.h +0
-15@@ -318,21 +318,6 @@ struct drm_device {*/ struct dentry *debugfs_root; -/** -* @debugfs_mutex: -* -* Protects &debugfs_list access. -*/ -struct mutex debugfs_mutex; - -/** -* @debugfs_list: -* -* List of debugfs files to be created by the DRM device. The files -* must be added during drm_dev_register(). -*/ -struct list_head debugfs_list; -/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY )Signature · 1 line
2.34.1
Re: [PATCH 3/5] drm/debugfs: remove dev->debugfs_list and debugfs_mutex v2
Quoted 14 lines · Christian König
Am 12.04.23 um 17:11 schrieb Daniel Vetter:
Quoted 9 lines · Christian König
Quoted 7 lines
The mutex was completely pointless in the first place since any parallel adding of files to this list would result in random behavior since the list is filled and consumed multiple times.
Completely drop that approach and just create the files directly but return
-ENODEVwhile opening the file when the minors are not registered yet.This part seems to be missing?
I wanted to move this into a separate patch and then forgot to add it. Going to fix that.
Quoted 7 lines
Quoted 4 lines
The other issue is that partial driver load cleanup now goes boom I think, you need to both remove them all in
_unregisterbut also in finaldrm_devcleanup. Or I'm missing how this works. Maybe you could also usedrmm_for that to make sure it's always done.Good point. Should we call the cleanup function from both the unregister and the final
drm_devcleanup or just the later?
I think both:
- unregister to make sure userspace can't access the files when the driver is unloading, because the _remove() is the only thing that actually synchronizes with parallel read/write() and waits for those to finish. Really don't want to hand-roll that, it's a lot more tricky than the "are we registered already" check :-)
- As cleanup for the case we never registered, and hence drm_dev_unregister wont be called.
I guess if you make both the exact same function and that unconditionally (any checks needed within that function) it hopefully aviods the not-registered error path from bitrotting.
-Daniel
Quoted 161 lines
Thanks,
Christian.Quoted 156 lines
There shouldn't be a race as long as the "are we registered yet" check is there, since in that case the driver never registered. So no problems trying to access the files when they could try to access things which are already cleaned up.
I think with those details ironed out this makes some sense to me, assuming I understood it correctly.
Quoted 147 lines
v2: rebase on debugfs directory rework, limit access before minors are
registered.Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/drm_debugfs.c | 27 ++------------------------- drivers/gpu/drm/drm_drv.c | 3 --- drivers/gpu/drm/drm_internal.h | 5 ----- drivers/gpu/drm/drm_mode_config.c | 2 -- include/drm/drm_device.h | 15 --------------- 5 files changed, 2 insertions(+), 50 deletions(-)drivers/gpu/drm/drm_debugfs.c +2
-25@@ -245,7 +245,6 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id, struct dentry *root) {struct drm_device *dev = minor->dev; -struct drm_debugfs_entry *entry, *tmp;char name[64 ];INIT_LIST_HEAD (&minor->debugfs_list);@@ -260,30 +259,9 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id,if (dev->driver->debugfs_init && dev->render != minor) dev->driver->debugfs_init (minor); -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -return 0 ; } -void drm_debugfs_late_register (struct drm_device *dev) -{ -struct drm_minor *minor = dev->primary; -struct drm_debugfs_entry *entry, *tmp; - -if (!minor) -return ; - -list_for_each_entry_safe (entry, tmp, &dev->debugfs_list, list) { -debugfs_create_file (entry->file.name,0444 , - minor->debugfs_root, entry, &drm_debugfs_entry_fops); -list_del (&entry->list); - } -} -int drm_debugfs_remove_files (const struct drm_info_list *files,int count,struct drm_minor *minor) {@@ -353,9 +331,8 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name, entry->file.data = data; entry->dev = dev; -mutex_lock (&dev->debugfs_mutex); -list_add (&entry->list, &dev->debugfs_list); -mutex_unlock (&dev->debugfs_mutex); +debugfs_create_file (name,0444 , dev->debugfs_root, entry, + &drm_debugfs_entry_fops); }EXPORT_SYMBOL (drm_debugfs_add_file);drivers/gpu/drm/drm_drv.c +0
-3@@ -597,7 +597,6 @@ static void drm_dev_init_release(struct drm_device *dev, void *res)mutex_destroy (&dev->clientlist_mutex);mutex_destroy (&dev->filelist_mutex);mutex_destroy (&dev->struct_mutex); -mutex_destroy (&dev->debugfs_mutex);drm_legacy_destroy_members (dev); }@@ -638,14 +637,12 @@ static int drm_dev_init(struct drm_device *dev,INIT_LIST_HEAD (&dev->filelist_internal);INIT_LIST_HEAD (&dev->clientlist);INIT_LIST_HEAD (&dev->vblank_event_list); -INIT_LIST_HEAD (&dev->debugfs_list);spin_lock_init (&dev->event_lock);mutex_init (&dev->struct_mutex);mutex_init (&dev->filelist_mutex);mutex_init (&dev->clientlist_mutex);mutex_init (&dev->master_mutex); -mutex_init (&dev->debugfs_mutex); ret =drmm_add_action_or_reset (dev, drm_dev_init_release,NULL );if (ret)drivers/gpu/drm/drm_internal.h +0
-5@@ -185,7 +185,6 @@ void drm_debugfs_dev_register(struct drm_device *dev);int drm_debugfs_register (struct drm_minor *minor,int minor_id,struct dentry *root);void drm_debugfs_cleanup (struct drm_minor *minor); -void drm_debugfs_late_register (struct drm_device *dev);void drm_debugfs_connector_add (struct drm_connector *connector);void drm_debugfs_connector_remove (struct drm_connector *connector);void drm_debugfs_crtc_add (struct drm_crtc *crtc);@@ -206,10 +205,6 @@ static inline void drm_debugfs_cleanup(struct drm_minor *minor) { } -static inline void drm_debugfs_late_register (struct drm_device *dev) -{ -} -static inline void drm_debugfs_connector_add (struct drm_connector *connector) { }drivers/gpu/drm/drm_mode_config.c +0
-2@@ -54,8 +54,6 @@ int drm_modeset_register_all(struct drm_device *dev)if (ret) goto err_connector; -drm_debugfs_late_register (dev); -return 0 ; err_connector:include/drm/drm_device.h +0
-15@@ -318,21 +318,6 @@ struct drm_device {*/ struct dentry *debugfs_root; -/** -* @debugfs_mutex: -* -* Protects &debugfs_list access. -*/ -struct mutex debugfs_mutex; - -/** -* @debugfs_list: -* -* List of debugfs files to be created by the DRM device. The files -* must be added during drm_dev_register(). -*/ -struct list_head debugfs_list; -/* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED (CONFIG_DRM_LEGACY )Signature · 1 line
2.34.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH 4/5 drm/debugfs: rework drm_debugfs_create_files implementation
In reply to Christian KönigUse managed memory allocation for this. That allows us to not keep track of all the files any more.
--- drivers/accel/drm_accel.c | 2 - drivers/gpu/drm/drm_debugfs.c | 75 +++++++++------------------------- drivers/gpu/drm/drm_drv.c | 2 - drivers/gpu/drm/drm_internal.h | 5 --- drivers/gpu/drm/tegra/dc.c | 9 +++- drivers/gpu/drm/tegra/dsi.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 3 +- drivers/gpu/drm/tegra/sor.c | 1 + include/drm/drm_debugfs.h | 4 +- include/drm/drm_file.h | 4 -- 10 files changed, 34 insertions(+), 72 deletions(-)
drivers/accel/drm_accel.c +0 -2
@@ -100,8 +100,6 @@ void accel_debugfs_register(struct drm_device *dev) {struct drm_minor *minor = dev->accel; -INIT_LIST_HEAD (&minor->debugfs_list); -mutex_init (&minor->debugfs_lock); minor->debugfs_root = dev->debugfs_root; drm_debugfs_create_files(accel_debugfs_list, ACCEL_DEBUGFS_ENTRIES,
drivers/gpu/drm/drm_debugfs.c +20 -55
104 lines not on this page · raw message
drivers/gpu/drm/drm_drv.c +0 -2
@@ -198,7 +198,6 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)return 0 ; err_debugfs: -drm_debugfs_cleanup (minor);return ret; }
@@ -222,7 +221,6 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type)device_del (minor->kdev);dev_set_drvdata (minor->kdev,NULL );/* safety belt */ -drm_debugfs_cleanup (minor); }/*
drivers/gpu/drm/drm_internal.h +0 -5
@@ -184,7 +184,6 @@ void drm_debugfs_dev_fini(struct drm_device *dev);void drm_debugfs_dev_register (struct drm_device *dev);int drm_debugfs_register (struct drm_minor *minor,int minor_id,struct dentry *root); -void drm_debugfs_cleanup (struct drm_minor *minor);void drm_debugfs_connector_add (struct drm_connector *connector);void drm_debugfs_connector_remove (struct drm_connector *connector);void drm_debugfs_crtc_add (struct drm_crtc *crtc);
@@ -201,10 +200,6 @@ static inline int drm_debugfs_register(struct drm_minor *minor, int minor_id,return 0 ; } -static inline void drm_debugfs_cleanup (struct drm_minor *minor) -{ -} -static inline void drm_debugfs_connector_add (struct drm_connector *connector) { }
drivers/gpu/drm/tegra/dc.c +8 -1
@@ -1745,8 +1745,15 @@ static void tegra_dc_early_unregister(struct drm_crtc *crtc)unsigned int count =ARRAY_SIZE (debugfs_files);struct drm_minor *minor = crtc->dev->primary;struct tegra_dc *dc =to_tegra_dc (crtc); +struct dentry *root; + +#ifdef CONFIG_DEBUG_FS + root = crtc->debugfs_entry; +#else + root =NULL ; +#endif -drm_debugfs_remove_files (dc->debugfs_files, count, minor); +drm_debugfs_remove_files (dc->debugfs_files, count, root, minor);kfree (dc->debugfs_files); dc->debugfs_files =NULL ; }
drivers/gpu/drm/tegra/dsi.c +1 -0
@@ -256,6 +256,7 @@ static void tegra_dsi_early_unregister(struct drm_connector *connector)struct tegra_dsi *dsi =to_dsi (output);drm_debugfs_remove_files (dsi->debugfs_files, count, + connector->debugfs_entry, connector->dev->primary);kfree (dsi->debugfs_files); dsi->debugfs_files =NULL ;
drivers/gpu/drm/tegra/hdmi.c +2 -1
@@ -1114,7 +1114,8 @@ static void tegra_hdmi_early_unregister(struct drm_connector *connector)unsigned int count =ARRAY_SIZE (debugfs_files);struct tegra_hdmi *hdmi =to_hdmi (output); -drm_debugfs_remove_files (hdmi->debugfs_files, count, minor); +drm_debugfs_remove_files (hdmi->debugfs_files, count, + connector->debugfs_entry, minor);kfree (hdmi->debugfs_files); hdmi->debugfs_files =NULL ; }
drivers/gpu/drm/tegra/sor.c +1 -0
@@ -1707,6 +1707,7 @@ static void tegra_sor_early_unregister(struct drm_connector *connector)struct tegra_sor *sor =to_sor (output);drm_debugfs_remove_files (sor->debugfs_files, count, + connector->debugfs_entry, connector->dev->primary);kfree (sor->debugfs_files); sor->debugfs_files =NULL ;
include/drm/drm_debugfs.h +2 -2
@@ -126,8 +126,8 @@ struct drm_debugfs_entry {void drm_debugfs_create_files (const struct drm_info_list *files,int count,struct dentry *root,struct drm_minor *minor); -int drm_debugfs_remove_files (const struct drm_info_list *files, -int count,struct drm_minor *minor); +int drm_debugfs_remove_files (const struct drm_info_list *files,int count, +struct dentry *root,struct drm_minor *minor);void drm_debugfs_add_file (struct drm_device *dev,const char *name,int (*show)(struct seq_file *,void *),void *data);
include/drm/drm_file.h +0 -4
@@ -78,11 +78,7 @@ struct drm_minor {struct device *kdev;/* Linux device */ struct drm_device *dev; -struct dentry *debugfs_symlink;struct dentry *debugfs_root; - -struct list_head debugfs_list; -struct mutex debugfs_lock;/* Protects debugfs_list. */ };/**
Signature · 1 line
2.34.1
PATCH 5/5 drm/debugfs: remove debugfs_root pointer from minor
In reply to Christian KönigWe only keept that around for API compatibility with drivers. Clean all this up and use the per device debugfs directory.
--- drivers/accel/drm_accel.c | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 +-- .../gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 +-- .../gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 3 +-- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_debugfs.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 3 --- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- .../drm/i915/display/intel_display_debugfs.c | 4 ++-- drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 9 ++++++--- drivers/gpu/drm/i915/display/intel_psr.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_wm.c | 9 ++++++--- drivers/gpu/drm/i915/display/skl_watermark.c | 6 ++++-- drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 4 ++-- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +- drivers/gpu/drm/i915/gvt/debugfs.c | 6 +++--- drivers/gpu/drm/i915/i915_debugfs.c | 6 +++--- drivers/gpu/drm/i915/i915_debugfs_params.c | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 ++-- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- drivers/gpu/drm/msm/dp/dp_debug.c | 2 +- drivers/gpu/drm/msm/msm_debugfs.c | 18 +++++++++--------- drivers/gpu/drm/msm/msm_perf.c | 2 +- drivers/gpu/drm/msm/msm_rd.c | 2 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 6 +++--- drivers/gpu/drm/omapdrm/omap_debugfs.c | 4 ++-- drivers/gpu/drm/pl111/pl111_debugfs.c | 2 +- drivers/gpu/drm/qxl/qxl_debugfs.c | 4 ++-- drivers/gpu/drm/qxl/qxl_ttm.c | 4 ++-- drivers/gpu/drm/radeon/r100.c | 6 +++--- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r420.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 2 +- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 2 +- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_drv.c | 4 ++-- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hda.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/sti/sti_mixer.c | 2 +- drivers/gpu/drm/sti/sti_tvout.c | 2 +- drivers/gpu/drm/sti/sti_vid.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/arcpgu.c | 2 +- drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- drivers/gpu/drm/virtio/virtgpu_debugfs.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 2 +- include/drm/drm_file.h | 2 -- 79 files changed, 122 insertions(+), 129 deletions(-)
drivers/accel/drm_accel.c +0 -2
@@ -100,8 +100,6 @@ void accel_debugfs_register(struct drm_device *dev) {struct drm_minor *minor = dev->accel; - minor->debugfs_root = dev->debugfs_root; -drm_debugfs_create_files (accel_debugfs_list,ACCEL_DEBUGFS_ENTRIES , dev->debugfs_root, minor); }
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -2
@@ -1454,7 +1454,7 @@ static const char *debugfs_regs_names[] = {int amdgpu_debugfs_regs_init (struct amdgpu_device *adev) {struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *ent, *root = minor->debugfs_root; +struct dentry *ent, *root = minor->dev->debugfs_root;unsigned int i;for (i =0 ; i <ARRAY_SIZE (debugfs_regs); i++) {
@@ -1926,7 +1926,7 @@ static const struct file_operations amdgpu_reset_dump_register_list = {int amdgpu_debugfs_init (struct amdgpu_device *adev) { -struct dentry *root =adev_to_drm (adev)->primary->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;struct dentry *ent;int r, i;
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -2
@@ -927,8 +927,7 @@ static void amdgpu_debugfs_reset_work(struct work_struct *work)void amdgpu_debugfs_fence_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;debugfs_create_file ("amdgpu_fence_info" ,0444 , root, adev, &amdgpu_debugfs_fence_info_fops);
drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c +1 -1
@@ -137,7 +137,7 @@ void amdgpu_fw_attestation_debugfs_init(struct amdgpu_device *adev)debugfs_create_file ("amdgpu_fw_attestation" ,S_IRUSR , -adev_to_drm (adev)->primary->debugfs_root, +adev_to_drm (adev)->debugfs_root, adev, &amdgpu_fw_attestation_debugfs_ops); }
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -2
@@ -994,8 +994,7 @@ DEFINE_SHOW_ATTRIBUTE(amdgpu_debugfs_gem_info);void amdgpu_debugfs_gem_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;debugfs_create_file ("amdgpu_gem_info" ,0444 , root, adev, &amdgpu_debugfs_gem_info_fops);
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +1 -2
@@ -457,8 +457,7 @@ DEFINE_SHOW_ATTRIBUTE(amdgpu_debugfs_sa_info);void amdgpu_debugfs_sa_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;debugfs_create_file ("amdgpu_sa_info" ,0444 , root, adev, &amdgpu_debugfs_sa_info_fops);
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -3
@@ -1704,11 +1704,9 @@ DEFINE_SHOW_ATTRIBUTE(amdgpu_debugfs_firmware_info);void amdgpu_debugfs_firmware_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;debugfs_create_file ("amdgpu_firmware_info" ,0444 , root, adev, &amdgpu_debugfs_firmware_info_fops); -#endif }
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +2 -3
@@ -373,9 +373,8 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, sizevoid amdgpu_ta_if_debugfs_init (struct amdgpu_device *adev) { -struct drm_minor *minor =adev_to_drm (adev)->primary; - -struct dentry *dir =debugfs_create_dir ("ta_if" , minor->debugfs_root); +struct dentry *root =adev_to_drm (adev)->debugfs_root; +struct dentry *dir =debugfs_create_dir ("ta_if" , root);debugfs_create_file ("ta_load" ,0200 , dir, adev, &ta_load_debugfs_fops);
drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c +3 -3
@@ -117,12 +117,12 @@ static const struct file_operations amdgpu_rap_debugfs_ops = {void amdgpu_rap_debugfs_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; +struct dentry *root =adev_to_drm (adev)->debugfs_root;if (!adev->psp.rap_context.context.initialized)return ; -debugfs_create_file ("rap_test" ,S_IWUSR , minor->debugfs_root, - adev, &amdgpu_rap_debugfs_ops); +debugfs_create_file ("rap_test" ,S_IWUSR , root, adev, + &amdgpu_rap_debugfs_ops);#endif }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3 -3
@@ -1440,10 +1440,10 @@ static int amdgpu_ras_sysfs_remove_all(struct amdgpu_device *adev)static struct dentry *amdgpu_ras_debugfs_create_ctrl_node (struct amdgpu_device *adev) {struct amdgpu_ras *con =amdgpu_ras_get_context (adev); -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *dir; +struct dentry *root =adev_to_drm (adev)->debugfs_root; +struct dentry *dir; - dir =debugfs_create_dir (RAS_FS_NAME , minor->debugfs_root); + dir =debugfs_create_dir (RAS_FS_NAME , root);debugfs_create_file ("ras_ctrl" ,S_IWUGO |S_IRUGO , dir, adev, &amdgpu_ras_debugfs_ctrl_ops); debugfs_create_file("ras_eeprom_reset", S_IWUGO | S_IRUGO, dir, adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1 -2
@@ -484,8 +484,7 @@ void amdgpu_debugfs_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;char name[32 ];sprintf (name,"amdgpu_ring_%s" , ring->name);
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c +1 -1
@@ -177,7 +177,7 @@ void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev)if (!adev->psp.securedisplay_context.context.initialized)return ; -debugfs_create_file ("securedisplay_test" ,S_IWUSR ,adev_to_drm (adev)->primary->debugfs_root, +debugfs_create_file ("securedisplay_test" ,S_IWUSR ,adev_to_drm (adev)->debugfs_root, adev, &amdgpu_securedisplay_debugfs_ops);#endif }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -2
@@ -2371,8 +2371,7 @@ static const struct file_operations amdgpu_ttm_iomem_fops = {void amdgpu_ttm_debugfs_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;debugfs_create_file_size ("amdgpu_vram" ,0444 , root, adev, &amdgpu_ttm_vram_fops, adev->gmc.mc_vram_size);
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +1 -2
@@ -1121,8 +1121,7 @@ void amdgpu_debugfs_vcn_fwlog_init(struct amdgpu_device *adev, uint8_t i, struct amdgpu_vcn_inst *vcn) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;char name[32 ];sprintf (name,"amdgpu_vcn_%d_fwlog" , i);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +1 -1
@@ -3658,7 +3658,7 @@ void dtn_debugfs_init(struct amdgpu_device *adev) };struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root = minor->dev->debugfs_root;debugfs_create_file ("amdgpu_mst_topology" ,0444 , root, adev, &mst_topo_fops);
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1 -2
@@ -3705,8 +3705,7 @@ static const struct file_operations amdgpu_debugfs_pm_prv_buffer_fops = {void amdgpu_debugfs_pm_init (struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor =adev_to_drm (adev)->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root =adev_to_drm (adev)->debugfs_root;if (!adev->pm.dpm_enabled)return ;
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -3215,7 +3215,7 @@ void amdgpu_smu_stb_debug_fs_init(struct amdgpu_device *adev)debugfs_create_file_size ("amdgpu_smu_stb_dump" ,S_IRUSR , -adev_to_drm (adev)->primary->debugfs_root, +adev_to_drm (adev)->debugfs_root, adev, &smu_stb_debugfs_fops, smu->stb_context.stb_buf_size);
drivers/gpu/drm/arm/malidp_drv.c +1 -1
@@ -552,7 +552,7 @@ static void malidp_debugfs_init(struct drm_minor *minor)malidp_error_stats_init (&malidp->de_errors);malidp_error_stats_init (&malidp->se_errors);spin_lock_init (&malidp->errors_lock); -debugfs_create_file ("debug" ,S_IRUGO |S_IWUSR , minor->debugfs_root, +debugfs_create_file ("debug" ,S_IRUGO |S_IWUSR , minor->dev->debugfs_root, minor->dev, &malidp_debugfs_fops); }
drivers/gpu/drm/armada/armada_debugfs.c +1 -1
@@ -105,7 +105,7 @@ static struct drm_info_list armada_debugfs_list[] = {int armada_drm_debugfs_init (struct drm_minor *minor) {drm_debugfs_create_files (armada_debugfs_list,ARMADA_DEBUGFS_ENTRIES , - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);return 0 ; }
drivers/gpu/drm/drm_debugfs.c +0 -3
@@ -264,9 +264,6 @@ int drm_debugfs_register(struct drm_minor *minor, int minor_id,sprintf (name,"%d" , minor_id);debugfs_create_symlink (name, root, dev->unique); -/* TODO: Only for compatibility with drivers */ - minor->debugfs_root = dev->debugfs_root; -if (dev->driver->debugfs_init && dev->render != minor) dev->driver->debugfs_init (minor);
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -1454,7 +1454,7 @@ void mipi_dbi_debugfs_init(struct drm_minor *minor)if (dbidev->dbi.read_commands) mode |=S_IRUGO ; -debugfs_create_file ("command" , mode, minor->debugfs_root, dbidev, +debugfs_create_file ("command" , mode, minor->dev->debugfs_root, dbidev, &mipi_dbi_debugfs_command_fops); }EXPORT_SYMBOL (mipi_dbi_debugfs_init);
drivers/gpu/drm/etnaviv/etnaviv_drv.c +1 -1
@@ -243,7 +243,7 @@ static void etnaviv_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (etnaviv_debugfs_list,ARRAY_SIZE (etnaviv_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }#endif
drivers/gpu/drm/i915/display/hsw_ips.c +1 -1
@@ -301,6 +301,6 @@ void hsw_ips_debugfs_register(struct drm_i915_private *i915) {struct drm_minor *minor = i915->drm.primary; -debugfs_create_file ("i915_ips_status" ,0444 , minor->debugfs_root, +debugfs_create_file ("i915_ips_status" ,0444 , minor->dev->debugfs_root, i915, &hsw_ips_debugfs_status_fops); }
drivers/gpu/drm/i915/display/intel_display_debugfs.c +2 -2
@@ -1083,14 +1083,14 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)for (i =0 ; i <ARRAY_SIZE (intel_display_debugfs_files); i++) {debugfs_create_file (intel_display_debugfs_files[i].name,S_IRUGO |S_IWUSR , - minor->debugfs_root, + minor->dev->debugfs_root,to_i915 (minor->dev), intel_display_debugfs_files[i].fops); }drm_debugfs_create_files (intel_display_debugfs_list,ARRAY_SIZE (intel_display_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);hsw_ips_debugfs_register (i915);intel_dmc_debugfs_register (i915);
drivers/gpu/drm/i915/display/intel_dmc.c +1 -1
@@ -1229,6 +1229,6 @@ void intel_dmc_debugfs_register(struct drm_i915_private *i915) {struct drm_minor *minor = i915->drm.primary; -debugfs_create_file ("i915_dmc_info" ,0444 , minor->debugfs_root, +debugfs_create_file ("i915_dmc_info" ,0444 , minor->dev->debugfs_root, i915, &intel_dmc_debugfs_status_fops); }
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -1839,5 +1839,5 @@ void intel_fbc_debugfs_register(struct drm_i915_private *i915) fbc = i915->display.fbc[INTEL_FBC_A ];if (fbc) -intel_fbc_debugfs_add (fbc, minor->debugfs_root); +intel_fbc_debugfs_add (fbc, minor->dev->debugfs_root); }
drivers/gpu/drm/i915/display/intel_hotplug.c +6 -3
@@ -943,10 +943,13 @@ void intel_hpd_debugfs_register(struct drm_i915_private *i915) {struct drm_minor *minor = i915->drm.primary; -debugfs_create_file ("i915_hpd_storm_ctl" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_hpd_storm_ctl" ,0644 , + minor->dev->debugfs_root, i915, &i915_hpd_storm_ctl_fops); -debugfs_create_file ("i915_hpd_short_storm_ctl" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_hpd_short_storm_ctl" ,0644 , + minor->dev->debugfs_root, i915, &i915_hpd_short_storm_ctl_fops); -debugfs_create_bool ("i915_ignore_long_hpd" ,0644 , minor->debugfs_root, +debugfs_create_bool ("i915_ignore_long_hpd" ,0644 , + minor->dev->debugfs_root, &i915->display.hotplug.ignore_long_hpd); }
drivers/gpu/drm/i915/display/intel_psr.c +4 -2
@@ -2870,10 +2870,12 @@ void intel_psr_debugfs_register(struct drm_i915_private *i915) {struct drm_minor *minor = i915->drm.primary; -debugfs_create_file ("i915_edp_psr_debug" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_edp_psr_debug" ,0644 , + minor->dev->debugfs_root, i915, &i915_edp_psr_debug_fops); -debugfs_create_file ("i915_edp_psr_status" ,0444 , minor->debugfs_root, +debugfs_create_file ("i915_edp_psr_status" ,0444 , + minor->dev->debugfs_root, i915, &i915_edp_psr_status_fops); }
drivers/gpu/drm/i915/display/intel_wm.c +6 -3
@@ -395,13 +395,16 @@ void intel_wm_debugfs_register(struct drm_i915_private *i915) {struct drm_minor *minor = i915->drm.primary; -debugfs_create_file ("i915_pri_wm_latency" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_pri_wm_latency" ,0644 , + minor->dev->debugfs_root, i915, &i915_pri_wm_latency_fops); -debugfs_create_file ("i915_spr_wm_latency" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_spr_wm_latency" ,0644 , + minor->dev->debugfs_root, i915, &i915_spr_wm_latency_fops); -debugfs_create_file ("i915_cur_wm_latency" ,0644 , minor->debugfs_root, +debugfs_create_file ("i915_cur_wm_latency" ,0644 , + minor->dev->debugfs_root, i915, &i915_cur_wm_latency_fops);skl_watermark_debugfs_register (i915);
drivers/gpu/drm/i915/display/skl_watermark.c +4 -2
@@ -3709,10 +3709,12 @@ void skl_watermark_debugfs_register(struct drm_i915_private *i915)struct drm_minor *minor = i915->drm.primary;if (HAS_IPC (i915)) -debugfs_create_file ("i915_ipc_status" ,0644 , minor->debugfs_root, i915, +debugfs_create_file ("i915_ipc_status" ,0644 , + minor->dev->debugfs_root, i915, &skl_watermark_ipc_status_fops);if (HAS_SAGV (i915)) -debugfs_create_file ("i915_sagv_status" ,0444 , minor->debugfs_root, i915, +debugfs_create_file ("i915_sagv_status" ,0444 , + minor->dev->debugfs_root, i915, &intel_sagv_status_fops); }
drivers/gpu/drm/i915/gt/intel_gt_debugfs.c +2 -2
@@ -84,10 +84,10 @@ void intel_gt_debugfs_register(struct intel_gt *gt) {struct dentry *root; -if (!gt->i915->drm.primary->debugfs_root) +if (!gt->i915->drm.debugfs_root)return ; - root =debugfs_create_dir ("gt" , gt->i915->drm.primary->debugfs_root); + root =debugfs_create_dir ("gt" , gt->i915->drm.debugfs_root);if (IS_ERR (root))return ;
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +1 -1
@@ -543,7 +543,7 @@ static int guc_log_relay_create(struct intel_guc_log *log) n_subbufs =8 ; guc_log_relay_chan =relay_open ("guc_log" , - i915->drm.primary->debugfs_root, + i915->drm.debugfs_root, subbuf_size, n_subbufs, &relay_callbacks, i915);if (!guc_log_relay_chan) {
drivers/gpu/drm/i915/gvt/debugfs.c +3 -3
@@ -195,7 +195,7 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu)struct intel_gvt *gvt = vgpu->gvt;struct drm_minor *minor = gvt->gt->i915->drm.primary; -if (minor->debugfs_root && gvt->debugfs_root) { +if (minor->dev->debugfs_root && gvt->debugfs_root) {debugfs_remove_recursive (vgpu->debugfs); vgpu->debugfs =NULL ; }
@@ -209,7 +209,7 @@ void intel_gvt_debugfs_init(struct intel_gvt *gvt) {struct drm_minor *minor = gvt->gt->i915->drm.primary; - gvt->debugfs_root =debugfs_create_dir ("gvt" , minor->debugfs_root); + gvt->debugfs_root =debugfs_create_dir ("gvt" , minor->dev->debugfs_root);debugfs_create_ulong ("num_tracked_mmio" ,0444 , gvt->debugfs_root, &gvt->mmio.num_tracked_mmio);
@@ -223,7 +223,7 @@ void intel_gvt_debugfs_clean(struct intel_gvt *gvt) {struct drm_minor *minor = gvt->gt->i915->drm.primary; -if (minor->debugfs_root) { +if (minor->dev->debugfs_root) {debugfs_remove_recursive (gvt->debugfs_root); gvt->debugfs_root =NULL ; }
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -783,17 +783,17 @@ void i915_debugfs_register(struct drm_i915_private *dev_priv)i915_debugfs_params (dev_priv); -debugfs_create_file ("i915_forcewake_user" ,S_IRUSR , minor->debugfs_root, +debugfs_create_file ("i915_forcewake_user" ,S_IRUSR , minor->dev->debugfs_root,to_i915 (minor->dev), &i915_forcewake_fops);for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) {debugfs_create_file (i915_debugfs_files[i].name,S_IRUGO |S_IWUSR , - minor->debugfs_root, + minor->dev->debugfs_root,to_i915 (minor->dev), i915_debugfs_files[i].fops); }drm_debugfs_create_files (i915_debugfs_list,ARRAY_SIZE (i915_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }
drivers/gpu/drm/i915/i915_debugfs_params.c +1 -1
@@ -248,7 +248,7 @@ struct dentry *i915_debugfs_params(struct drm_i915_private *i915)struct i915_params *params = &i915->params;struct dentry *dir; - dir =debugfs_create_dir ("i915_params" , minor->debugfs_root); + dir =debugfs_create_dir ("i915_params" , minor->dev->debugfs_root);if (IS_ERR (dir))return dir;
drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c +2 -2
@@ -72,10 +72,10 @@ void intel_pxp_debugfs_register(struct intel_pxp *pxp)return ; minor = pxp->ctrl_gt->i915->drm.primary; -if (!minor->debugfs_root) +if (!minor->dev->debugfs_root)return ; - pxproot =debugfs_create_dir ("pxp" , minor->debugfs_root); + pxproot =debugfs_create_dir ("pxp" , minor->dev->debugfs_root);if (IS_ERR (pxproot))return ;
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2 -2
@@ -152,8 +152,8 @@ void a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)drm_debugfs_create_files (a5xx_debugfs_list,ARRAY_SIZE (a5xx_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); -debugfs_create_file_unsafe ("reset" ,S_IWUGO , minor->debugfs_root, dev, +debugfs_create_file_unsafe ("reset" ,S_IWUGO , minor->dev->debugfs_root, dev, &reset_fops); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
@@ -2137,7 +2137,7 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)/* create overall sub-directory for the encoder */ dpu_enc->debugfs_root =debugfs_create_dir (name, - drm_enc->dev->primary->debugfs_root); + drm_enc->dev->debugfs_root);/* don't error check these */ debugfs_create_file("status", 0600,
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
@@ -269,7 +269,7 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) dev = dpu_kms->dev; priv = dev->dev_private; - entry =debugfs_create_dir ("debug" , minor->debugfs_root); + entry =debugfs_create_dir ("debug" , minor->dev->debugfs_root);debugfs_create_x32 (DPU_DEBUGFS_HWMASKNAME ,0600 , entry, p);
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +1 -1
@@ -253,7 +253,7 @@ static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) {drm_debugfs_create_files (mdp5_debugfs_list,ARRAY_SIZE (mdp5_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);return 0 ; }
drivers/gpu/drm/msm/dp/dp_debug.c +1 -1
@@ -213,7 +213,7 @@ static void dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)snprintf (path,sizeof (path),"msm_dp-%s" , debug->connector->name); - debug->root =debugfs_create_dir (path, minor->debugfs_root); + debug->root =debugfs_create_dir (path, minor->dev->debugfs_root);debugfs_create_file ("dp_debug" ,0444 , debug->root, debug, &dp_debug_fops);
drivers/gpu/drm/msm/msm_debugfs.c +9 -9
@@ -309,24 +309,24 @@ void msm_debugfs_init(struct drm_minor *minor)drm_debugfs_create_files (msm_debugfs_list,ARRAY_SIZE (msm_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); -debugfs_create_file ("gpu" ,S_IRUSR , minor->debugfs_root, +debugfs_create_file ("gpu" ,S_IRUSR , minor->dev->debugfs_root, dev, &msm_gpu_fops); -debugfs_create_file ("kms" ,S_IRUSR , minor->debugfs_root, +debugfs_create_file ("kms" ,S_IRUSR , minor->dev->debugfs_root, dev, &msm_kms_fops); -debugfs_create_u32 ("hangcheck_period_ms" ,0600 , minor->debugfs_root, +debugfs_create_u32 ("hangcheck_period_ms" ,0600 , minor->dev->debugfs_root, &priv->hangcheck_period); -debugfs_create_bool ("disable_err_irq" ,0600 , minor->debugfs_root, +debugfs_create_bool ("disable_err_irq" ,0600 , minor->dev->debugfs_root, &priv->disable_err_irq); -debugfs_create_file ("shrink" ,S_IRWXU , minor->debugfs_root, +debugfs_create_file ("shrink" ,S_IRWXU , minor->dev->debugfs_root, dev, &shrink_fops); - gpu_devfreq =debugfs_create_dir ("devfreq" , minor->debugfs_root); + gpu_devfreq =debugfs_create_dir ("devfreq" , dev->debugfs_root);debugfs_create_bool ("idle_clamp" ,0600 , gpu_devfreq, &priv->gpu_clamp_to_idle);
@@ -341,9 +341,9 @@ void msm_debugfs_init(struct drm_minor *minor) priv->kms->funcs->debugfs_init (priv->kms, minor);#ifdef CONFIG_FAULT_INJECTION -fault_create_debugfs_attr ("fail_gem_alloc" , minor->debugfs_root, +fault_create_debugfs_attr ("fail_gem_alloc" , minor->dev->debugfs_root, &fail_gem_alloc); -fault_create_debugfs_attr ("fail_gem_iova" , minor->debugfs_root, +fault_create_debugfs_attr ("fail_gem_iova" , minor->dev->debugfs_root, &fail_gem_iova);#endif }
drivers/gpu/drm/msm/msm_perf.c +1 -1
@@ -214,7 +214,7 @@ int msm_perf_debugfs_init(struct drm_minor *minor)mutex_init (&perf->read_lock); priv->perf = perf; -debugfs_create_file ("perf" ,S_IFREG |S_IRUGO , minor->debugfs_root, +debugfs_create_file ("perf" ,S_IFREG |S_IRUGO , minor->dev->debugfs_root, perf, &perf_debugfs_fops);return 0 ; }
drivers/gpu/drm/msm/msm_rd.c +1 -1
@@ -261,7 +261,7 @@ static struct msm_rd_state *rd_init(struct drm_minor *minor, const char *name)init_waitqueue_head (&rd->fifo_event); -debugfs_create_file (name,S_IFREG |S_IRUGO , minor->debugfs_root, rd, +debugfs_create_file (name,S_IFREG |S_IRUGO , minor->dev->debugfs_root, rd, &rd_debugfs_fops);return rd;
drivers/gpu/drm/nouveau/nouveau_debugfs.c +3 -3
@@ -233,18 +233,18 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)for (i =0 ; i <ARRAY_SIZE (nouveau_debugfs_files); i++) {debugfs_create_file (nouveau_debugfs_files[i].name,S_IRUGO |S_IWUSR , - minor->debugfs_root, minor->dev, + minor->dev->debugfs_root, minor->dev, nouveau_debugfs_files[i].fops); }drm_debugfs_create_files (nouveau_debugfs_list,NOUVEAU_DEBUGFS_ENTRIES , - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);/* Set the size of the vbios since we know it, and it's confusing to * userspace if it wants to seek() but the file has a length of 0 */ - dentry =debugfs_lookup ("vbios.rom" , minor->debugfs_root); + dentry =debugfs_lookup ("vbios.rom" , minor->dev->debugfs_root);if (!dentry)return ;
drivers/gpu/drm/omapdrm/omap_debugfs.c +2 -2
@@ -85,12 +85,12 @@ void omap_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (omap_debugfs_list,ARRAY_SIZE (omap_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);if (dmm_is_available ())drm_debugfs_create_files (omap_dmm_debugfs_list,ARRAY_SIZE (omap_dmm_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }#endif
drivers/gpu/drm/pl111/pl111_debugfs.c +1 -1
@@ -55,5 +55,5 @@ pl111_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (pl111_debugfs_list,ARRAY_SIZE (pl111_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }
drivers/gpu/drm/qxl/qxl_debugfs.c +2 -2
@@ -90,7 +90,7 @@ qxl_debugfs_init(struct drm_minor *minor)struct qxl_device *dev =to_qxl (minor->dev);drm_debugfs_create_files (qxl_debugfs_list,QXL_DEBUGFS_ENTRIES , - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);qxl_ttm_debugfs_init (dev);#endif
@@ -120,7 +120,7 @@ void qxl_debugfs_add_files(struct qxl_device *qdev, qdev->debugfs_count = i;#if defined(CONFIG_DEBUG_FS )drm_debugfs_create_files (files, nfiles, - qdev->ddev.primary->debugfs_root, + qdev->ddev.debugfs_root, qdev->ddev.primary);#endif }
drivers/gpu/drm/qxl/qxl_ttm.c +2 -2
@@ -238,9 +238,9 @@ void qxl_ttm_debugfs_init(struct qxl_device *qdev)#if defined(CONFIG_DEBUG_FS )ttm_resource_manager_create_debugfs (ttm_manager_type (&qdev->mman.bdev,TTM_PL_VRAM ), - qdev->ddev.primary->debugfs_root,"qxl_mem_mm" ); + qdev->ddev.debugfs_root,"qxl_mem_mm" );ttm_resource_manager_create_debugfs (ttm_manager_type (&qdev->mman.bdev,TTM_PL_PRIV ), - qdev->ddev.primary->debugfs_root,"qxl_surf_mm" ); + qdev->ddev.debugfs_root,"qxl_surf_mm" );#endif }
drivers/gpu/drm/radeon/r100.c +3 -3
@@ -3058,7 +3058,7 @@ DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info);void r100_debugfs_rbbm_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("r100_rbbm_info" ,0444 , root, rdev, &r100_debugfs_rbbm_info_fops);
@@ -3068,7 +3068,7 @@ void r100_debugfs_rbbm_init(struct radeon_device *rdev)void r100_debugfs_cp_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("r100_cp_ring_info" ,0444 , root, rdev, &r100_debugfs_cp_ring_info_fops);
@@ -3080,7 +3080,7 @@ void r100_debugfs_cp_init(struct radeon_device *rdev)void r100_debugfs_mc_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("r100_mc_info" ,0444 , root, rdev, &r100_debugfs_mc_info_fops);
drivers/gpu/drm/radeon/r300.c +1 -1
@@ -615,7 +615,7 @@ DEFINE_SHOW_ATTRIBUTE(rv370_debugfs_pcie_gart_info);static void rv370_debugfs_pcie_gart_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("rv370_pcie_gart_info" ,0444 , root, rdev, &rv370_debugfs_pcie_gart_info_fops);
drivers/gpu/drm/radeon/r420.c +1 -1
@@ -492,7 +492,7 @@ DEFINE_SHOW_ATTRIBUTE(r420_debugfs_pipes_info);void r420_debugfs_pipes_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("r420_pipes_info" ,0444 , root, rdev, &r420_debugfs_pipes_info_fops);
drivers/gpu/drm/radeon/r600.c +1 -1
@@ -4358,7 +4358,7 @@ DEFINE_SHOW_ATTRIBUTE(r600_debugfs_mc_info);static void r600_debugfs_mc_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("r600_mc_info" ,0444 , root, rdev, &r600_debugfs_mc_info_fops);
drivers/gpu/drm/radeon/radeon_fence.c +1 -1
@@ -1004,7 +1004,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(radeon_debugfs_gpu_reset_fops,void radeon_debugfs_fence_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("radeon_gpu_reset" ,0444 , root, rdev, &radeon_debugfs_gpu_reset_fops);
drivers/gpu/drm/radeon/radeon_gem.c +1 -1
@@ -892,7 +892,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_gem_info);void radeon_gem_debugfs_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("radeon_gem_info" ,0444 , root, rdev, &radeon_debugfs_gem_info_fops);
drivers/gpu/drm/radeon/radeon_ib.c +1 -1
@@ -307,7 +307,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_sa_info);static void radeon_debugfs_sa_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("radeon_sa_info" ,0444 , root, rdev, &radeon_debugfs_sa_info_fops);
drivers/gpu/drm/radeon/radeon_pm.c +1 -1
@@ -1954,7 +1954,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_pm_info);static void radeon_debugfs_pm_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("radeon_pm_info" ,0444 , root, rdev, &radeon_debugfs_pm_info_fops);
drivers/gpu/drm/radeon/radeon_ring.c +1 -1
@@ -548,7 +548,7 @@ static void radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_r {#if defined(CONFIG_DEBUG_FS )const char *ring_name =radeon_debugfs_ring_idx_to_name (ring->idx); -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;if (ring_name) debugfs_create_file(ring_name, 0444, root, ring,
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -899,7 +899,7 @@ static void radeon_ttm_debugfs_init(struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor = rdev->ddev->primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root = minor->dev->debugfs_root;debugfs_create_file ("radeon_vram" ,0444 , root, rdev, &radeon_ttm_vram_fops);
drivers/gpu/drm/radeon/rs400.c +1 -1
@@ -378,7 +378,7 @@ DEFINE_SHOW_ATTRIBUTE(rs400_debugfs_gart_info);static void rs400_debugfs_pcie_gart_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("rs400_gart_info" ,0444 , root, rdev, &rs400_debugfs_gart_info_fops);
drivers/gpu/drm/radeon/rv515.c +1 -1
@@ -255,7 +255,7 @@ DEFINE_SHOW_ATTRIBUTE(rv515_debugfs_ga_info);void rv515_debugfs (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root = rdev->ddev->debugfs_root;debugfs_create_file ("rv515_pipes_info" ,0444 , root, rdev, &rv515_debugfs_pipes_info_fops);
drivers/gpu/drm/sti/sti_cursor.c +1 -1
@@ -142,7 +142,7 @@ static void cursor_debugfs_init(struct sti_cursor *cursor,drm_debugfs_create_files (cursor_debugfs_files,ARRAY_SIZE (cursor_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }static void sti_cursor_argb8888_to_clut8 (struct sti_cursor *cursor,u32 *src)
drivers/gpu/drm/sti/sti_drv.c +2 -2
@@ -95,9 +95,9 @@ static void sti_drm_dbg_init(struct drm_minor *minor) {drm_debugfs_create_files (sti_drm_dbg_list,ARRAY_SIZE (sti_drm_dbg_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); -debugfs_create_file ("fps_show" ,S_IRUGO |S_IWUSR , minor->debugfs_root, +debugfs_create_file ("fps_show" ,S_IRUGO |S_IWUSR , minor->dev->debugfs_root, minor->dev, &sti_drm_fps_fops);DRM_INFO ("%s: debugfs installed\n" ,DRIVER_NAME );
drivers/gpu/drm/sti/sti_dvo.c +1 -1
@@ -205,7 +205,7 @@ static void dvo_debugfs_init(struct sti_dvo *dvo, struct drm_minor *minor)drm_debugfs_create_files (dvo_debugfs_files,ARRAY_SIZE (dvo_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }static void sti_dvo_disable (struct drm_bridge *bridge)
drivers/gpu/drm/sti/sti_gdp.c +1 -1
@@ -347,7 +347,7 @@ static int gdp_debugfs_init(struct sti_gdp *gdp, struct drm_minor *minor)drm_debugfs_create_files (gdp_debugfs_files, nb_files, - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);return 0 ; }
drivers/gpu/drm/sti/sti_hda.c +1 -1
@@ -377,7 +377,7 @@ static void hda_debugfs_init(struct sti_hda *hda, struct drm_minor *minor)drm_debugfs_create_files (hda_debugfs_files,ARRAY_SIZE (hda_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }/**
drivers/gpu/drm/sti/sti_hdmi.c +1 -1
@@ -743,7 +743,7 @@ static void hdmi_debugfs_init(struct sti_hdmi *hdmi, struct drm_minor *minor)drm_debugfs_create_files (hdmi_debugfs_files,ARRAY_SIZE (hdmi_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }static void sti_hdmi_disable (struct drm_bridge *bridge)
drivers/gpu/drm/sti/sti_hqvdp.c +1 -1
@@ -650,7 +650,7 @@ static void hqvdp_debugfs_init(struct sti_hqvdp *hqvdp, struct drm_minor *minor)drm_debugfs_create_files (hqvdp_debugfs_files,ARRAY_SIZE (hqvdp_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }/**
drivers/gpu/drm/sti/sti_mixer.c +1 -1
@@ -202,7 +202,7 @@ void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor)drm_debugfs_create_files (mixer_debugfs_files, nb_files, - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }void sti_mixer_set_background_status (struct sti_mixer *mixer,bool enable)
drivers/gpu/drm/sti/sti_tvout.c +1 -1
@@ -579,7 +579,7 @@ static void tvout_debugfs_init(struct sti_tvout *tvout, struct drm_minor *minor)drm_debugfs_create_files (tvout_debugfs_files,ARRAY_SIZE (tvout_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }static void sti_tvout_encoder_dpms (struct drm_encoder *encoder,int mode)
drivers/gpu/drm/sti/sti_vid.c +1 -1
@@ -133,7 +133,7 @@ void vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)drm_debugfs_create_files (vid_debugfs_files,ARRAY_SIZE (vid_debugfs_files), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); } void sti_vid_commit(struct sti_vid *vid,
drivers/gpu/drm/tegra/drm.c +1 -1
@@ -876,7 +876,7 @@ static void tegra_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (tegra_debugfs_list,ARRAY_SIZE (tegra_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }#endif
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -1
@@ -468,7 +468,7 @@ static void tilcdc_debugfs_init(struct drm_minor *minor)drm_debugfs_create_files (tilcdc_debugfs_list,ARRAY_SIZE (tilcdc_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor);list_for_each_entry (mod, &module_list, list)if (mod->funcs->debugfs_init)
drivers/gpu/drm/tiny/arcpgu.c +1 -1
@@ -357,7 +357,7 @@ static void arcpgu_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (arcpgu_debugfs_list,ARRAY_SIZE (arcpgu_debugfs_list), - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }#endif
drivers/gpu/drm/vc4/vc4_hvs.c +1 -1
@@ -769,7 +769,7 @@ int vc4_hvs_debugfs_init(struct drm_minor *minor)if (!vc4->is_vc5)debugfs_create_bool ("hvs_load_tracker" ,S_IRUGO |S_IWUSR , - minor->debugfs_root, + minor->dev->debugfs_root, &vc4->load_tracker_enabled);drm_debugfs_add_file (drm,"hvs_dlists" , vc4_hvs_debugfs_dlist,NULL );
drivers/gpu/drm/virtio/virtgpu_debugfs.c +1 -1
@@ -107,5 +107,5 @@ virtio_gpu_debugfs_init(struct drm_minor *minor) {drm_debugfs_create_files (virtio_gpu_debugfs_list,VIRTIO_GPU_DEBUGFS_ENTRIES , - minor->debugfs_root, minor); + minor->dev->debugfs_root, minor); }
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -1
@@ -1409,7 +1409,7 @@ static void vmw_remove(struct pci_dev *pdev)static void vmw_debugfs_resource_managers_init (struct vmw_private *vmw) {struct drm_minor *minor = vmw->drm.primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root = minor->dev->debugfs_root;ttm_resource_manager_create_debugfs (ttm_manager_type (&vmw->bdev,TTM_PL_SYSTEM ), root,"system_ttm" );
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +1 -1
@@ -267,7 +267,7 @@ void vmw_debugfs_gem_init(struct vmw_private *vdev) {#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor = vdev->drm.primary; -struct dentry *root = minor->debugfs_root; +struct dentry *root = minor->dev->debugfs_root;debugfs_create_file ("vmwgfx_gem_info" ,0444 , root, vdev, &vmw_debugfs_gem_info_fops);
include/drm/drm_file.h +0 -2
@@ -77,8 +77,6 @@ struct drm_minor {int type;/* Control or render or accel */ struct device *kdev;/* Linux device */ struct drm_device *dev; - -struct dentry *debugfs_root; };/**
Signature · 1 line
2.34.1
Oded Gabbay
maintainerQuoted 13 lines · Christian König
Hi guys,
took me some tries to get the Intel CI happy with this patch set.
This is the version rebased on drm-misc-next, for a CI run you actually need to rebase the last patch to drm-tip. So I'm planning to merge 1-4 for this cycle and the last one after everything merged together again.
Please review,
Christian.
Hi Christian,
Are we on track with this plan ?
I think I didn't see the patches getting merged yet, but perhaps I'm wrong. We are actually waiting for them to do the move in habanalabs to /dev/accel nodes, so it will really be helpful if you can merge them at your earliest convenience.
Thanks,
Oded