| Message ID | 20221226155029.244355-3-mcanal@igalia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert drivers to the new debugfs device-centered functions | expand |
On 12/26/22 16:50, Maíra Canal wrote: > Replace the use of drm_debugfs_create_files() with the new > drm_debugfs_add_file() function, which center the debugfs files > management on the drm_device instead of drm_minor. Moreover, remove the > debugfs_init hook and add the debugfs files directly on gud_probe(), > before drm_dev_register(). > > Signed-off-by: Maíra Canal <mcanal@igalia.com> > --- Acked-by: Noralf Trønnes <noralf@tronnes.org>
On 12/26/22 12:50, Maíra Canal wrote: > Replace the use of drm_debugfs_create_files() with the new > drm_debugfs_add_file() function, which center the debugfs files > management on the drm_device instead of drm_minor. Moreover, remove the > debugfs_init hook and add the debugfs files directly on gud_probe(), > before drm_dev_register(). > > Signed-off-by: Maíra Canal <mcanal@igalia.com> Applied to drm/drm-misc (drm-misc-next). Best Regards, - Maíra Canal > --- > drivers/gpu/drm/gud/gud_drv.c | 17 ++++------------- > 1 file changed, 4 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c > index 5aac7cda0505..9d7bf8ee45f1 100644 > --- a/drivers/gpu/drm/gud/gud_drv.c > +++ b/drivers/gpu/drm/gud/gud_drv.c > @@ -325,8 +325,8 @@ static struct drm_gem_object *gud_gem_prime_import(struct drm_device *drm, struc > > static int gud_stats_debugfs(struct seq_file *m, void *data) > { > - struct drm_info_node *node = m->private; > - struct gud_device *gdrm = to_gud_device(node->minor->dev); > + struct drm_debugfs_entry *entry = m->private; > + struct gud_device *gdrm = to_gud_device(entry->dev); > char buf[10]; > > string_get_size(gdrm->bulk_len, 1, STRING_UNITS_2, buf, sizeof(buf)); > @@ -352,16 +352,6 @@ static int gud_stats_debugfs(struct seq_file *m, void *data) > return 0; > } > > -static const struct drm_info_list gud_debugfs_list[] = { > - { "stats", gud_stats_debugfs, 0, NULL }, > -}; > - > -static void gud_debugfs_init(struct drm_minor *minor) > -{ > - drm_debugfs_create_files(gud_debugfs_list, ARRAY_SIZE(gud_debugfs_list), > - minor->debugfs_root, minor); > -} > - > static const struct drm_simple_display_pipe_funcs gud_pipe_funcs = { > .check = gud_pipe_check, > .update = gud_pipe_update, > @@ -386,7 +376,6 @@ static const struct drm_driver gud_drm_driver = { > .fops = &gud_fops, > DRM_GEM_SHMEM_DRIVER_OPS, > .gem_prime_import = gud_gem_prime_import, > - .debugfs_init = gud_debugfs_init, > > .name = "gud", > .desc = "Generic USB Display", > @@ -623,6 +612,8 @@ static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id) > if (!gdrm->dmadev) > dev_warn(dev, "buffer sharing not supported"); > > + drm_debugfs_add_file(drm, "stats", gud_stats_debugfs, NULL); > + > ret = drm_dev_register(drm, 0); > if (ret) { > put_device(gdrm->dmadev);
diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c index 5aac7cda0505..9d7bf8ee45f1 100644 --- a/drivers/gpu/drm/gud/gud_drv.c +++ b/drivers/gpu/drm/gud/gud_drv.c @@ -325,8 +325,8 @@ static struct drm_gem_object *gud_gem_prime_import(struct drm_device *drm, struc static int gud_stats_debugfs(struct seq_file *m, void *data) { - struct drm_info_node *node = m->private; - struct gud_device *gdrm = to_gud_device(node->minor->dev); + struct drm_debugfs_entry *entry = m->private; + struct gud_device *gdrm = to_gud_device(entry->dev); char buf[10]; string_get_size(gdrm->bulk_len, 1, STRING_UNITS_2, buf, sizeof(buf)); @@ -352,16 +352,6 @@ static int gud_stats_debugfs(struct seq_file *m, void *data) return 0; } -static const struct drm_info_list gud_debugfs_list[] = { - { "stats", gud_stats_debugfs, 0, NULL }, -}; - -static void gud_debugfs_init(struct drm_minor *minor) -{ - drm_debugfs_create_files(gud_debugfs_list, ARRAY_SIZE(gud_debugfs_list), - minor->debugfs_root, minor); -} - static const struct drm_simple_display_pipe_funcs gud_pipe_funcs = { .check = gud_pipe_check, .update = gud_pipe_update, @@ -386,7 +376,6 @@ static const struct drm_driver gud_drm_driver = { .fops = &gud_fops, DRM_GEM_SHMEM_DRIVER_OPS, .gem_prime_import = gud_gem_prime_import, - .debugfs_init = gud_debugfs_init, .name = "gud", .desc = "Generic USB Display", @@ -623,6 +612,8 @@ static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id) if (!gdrm->dmadev) dev_warn(dev, "buffer sharing not supported"); + drm_debugfs_add_file(drm, "stats", gud_stats_debugfs, NULL); + ret = drm_dev_register(drm, 0); if (ret) { put_device(gdrm->dmadev);
Replace the use of drm_debugfs_create_files() with the new drm_debugfs_add_file() function, which center the debugfs files management on the drm_device instead of drm_minor. Moreover, remove the debugfs_init hook and add the debugfs files directly on gud_probe(), before drm_dev_register(). Signed-off-by: Maíra Canal <mcanal@igalia.com> --- drivers/gpu/drm/gud/gud_drv.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)