On 09/01/2026 13:07, Boris Brezillon wrote: > There's no reason for panthor_drv to know about panthor_gem.c internals, > so let's move the GEM debugfs init logic to panthor_gem.c. > > Signed-off-by: Boris Brezillon <[email protected]>
Reviewed-by: Steven Price <[email protected]> > --- > drivers/gpu/drm/panthor/panthor_drv.c | 26 +----------------------- > drivers/gpu/drm/panthor/panthor_gem.c | 29 +++++++++++++++++++++++++-- > drivers/gpu/drm/panthor/panthor_gem.h | 3 +-- > 3 files changed, 29 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_drv.c > b/drivers/gpu/drm/panthor/panthor_drv.c > index 165dddfde6ca..52c27a60c84a 100644 > --- a/drivers/gpu/drm/panthor/panthor_drv.c > +++ b/drivers/gpu/drm/panthor/panthor_drv.c > @@ -1635,34 +1635,10 @@ static const struct file_operations > panthor_drm_driver_fops = { > }; > > #ifdef CONFIG_DEBUG_FS > -static int panthor_gems_show(struct seq_file *m, void *data) > -{ > - struct drm_info_node *node = m->private; > - struct drm_device *dev = node->minor->dev; > - struct panthor_device *ptdev = container_of(dev, struct panthor_device, > base); > - > - panthor_gem_debugfs_print_bos(ptdev, m); > - > - return 0; > -} > - > -static struct drm_info_list panthor_debugfs_list[] = { > - {"gems", panthor_gems_show, 0, NULL}, > -}; > - > -static int panthor_gems_debugfs_init(struct drm_minor *minor) > -{ > - drm_debugfs_create_files(panthor_debugfs_list, > - ARRAY_SIZE(panthor_debugfs_list), > - minor->debugfs_root, minor); > - > - return 0; > -} > - > static void panthor_debugfs_init(struct drm_minor *minor) > { > panthor_mmu_debugfs_init(minor); > - panthor_gems_debugfs_init(minor); > + panthor_gem_debugfs_init(minor); > } > #endif > > diff --git a/drivers/gpu/drm/panthor/panthor_gem.c > b/drivers/gpu/drm/panthor/panthor_gem.c > index b61908fd508a..13e9dd3764fa 100644 > --- a/drivers/gpu/drm/panthor/panthor_gem.c > +++ b/drivers/gpu/drm/panthor/panthor_gem.c > @@ -9,6 +9,8 @@ > #include <linux/err.h> > #include <linux/slab.h> > > +#include <drm/drm_debugfs.h> > +#include <drm/drm_file.h> > #include <drm/drm_print.h> > #include <drm/panthor_drm.h> > > @@ -683,8 +685,8 @@ static void panthor_gem_debugfs_bo_print(struct > panthor_gem_object *bo, > totals->reclaimable += resident_size; > } > > -void panthor_gem_debugfs_print_bos(struct panthor_device *ptdev, > - struct seq_file *m) > +static void panthor_gem_debugfs_print_bos(struct panthor_device *ptdev, > + struct seq_file *m) > { > struct gem_size_totals totals = {0}; > struct panthor_gem_object *bo; > @@ -704,4 +706,27 @@ void panthor_gem_debugfs_print_bos(struct panthor_device > *ptdev, > seq_printf(m, "Total size: %zd, Total resident: %zd, Total reclaimable: > %zd\n", > totals.size, totals.resident, totals.reclaimable); > } > + > +static int panthor_gem_show_bos(struct seq_file *m, void *data) > +{ > + struct drm_info_node *node = m->private; > + struct drm_device *dev = node->minor->dev; > + struct panthor_device *ptdev = > + container_of(dev, struct panthor_device, base); > + > + panthor_gem_debugfs_print_bos(ptdev, m); > + > + return 0; > +} > + > +static struct drm_info_list panthor_gem_debugfs_list[] = { > + { "gems", panthor_gem_show_bos, 0, NULL }, > +}; > + > +void panthor_gem_debugfs_init(struct drm_minor *minor) > +{ > + drm_debugfs_create_files(panthor_gem_debugfs_list, > + ARRAY_SIZE(panthor_gem_debugfs_list), > + minor->debugfs_root, minor); > +} > #endif > diff --git a/drivers/gpu/drm/panthor/panthor_gem.h > b/drivers/gpu/drm/panthor/panthor_gem.h > index 22519c570b5a..94b2d17cf032 100644 > --- a/drivers/gpu/drm/panthor/panthor_gem.h > +++ b/drivers/gpu/drm/panthor/panthor_gem.h > @@ -203,8 +203,7 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, > struct panthor_vm *vm, > void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo); > > #ifdef CONFIG_DEBUG_FS > -void panthor_gem_debugfs_print_bos(struct panthor_device *pfdev, > - struct seq_file *m); > +void panthor_gem_debugfs_init(struct drm_minor *minor); > #endif > > #endif /* __PANTHOR_GEM_H__ */
