Commit c0dda238 authored by Maíra Canal's avatar Maíra Canal Committed by Maíra Canal

drm/v3d: use new debugfs device-centered functions

Replace the use of drm_debugfs_create_files() with the new
drm_debugfs_add_files() function, which centers the debugfs files
management on the drm_device instead of drm_minor.
Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarMelissa Wen <mwen@igalia.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarMaíra Canal <mairacanal@riseup.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219120621.15086-6-mcanal@igalia.com
parent f2ede40e
...@@ -79,8 +79,8 @@ static const struct v3d_reg_def v3d_csd_reg_defs[] = { ...@@ -79,8 +79,8 @@ static const struct v3d_reg_def v3d_csd_reg_defs[] = {
static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused) static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused)
{ {
struct drm_info_node *node = (struct drm_info_node *)m->private; struct drm_debugfs_entry *entry = m->private;
struct drm_device *dev = node->minor->dev; struct drm_device *dev = entry->dev;
struct v3d_dev *v3d = to_v3d_dev(dev); struct v3d_dev *v3d = to_v3d_dev(dev);
int i, core; int i, core;
...@@ -126,8 +126,8 @@ static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused) ...@@ -126,8 +126,8 @@ static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused)
static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
{ {
struct drm_info_node *node = (struct drm_info_node *)m->private; struct drm_debugfs_entry *entry = m->private;
struct drm_device *dev = node->minor->dev; struct drm_device *dev = entry->dev;
struct v3d_dev *v3d = to_v3d_dev(dev); struct v3d_dev *v3d = to_v3d_dev(dev);
u32 ident0, ident1, ident2, ident3, cores; u32 ident0, ident1, ident2, ident3, cores;
int core; int core;
...@@ -188,8 +188,8 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) ...@@ -188,8 +188,8 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
static int v3d_debugfs_bo_stats(struct seq_file *m, void *unused) static int v3d_debugfs_bo_stats(struct seq_file *m, void *unused)
{ {
struct drm_info_node *node = (struct drm_info_node *)m->private; struct drm_debugfs_entry *entry = m->private;
struct drm_device *dev = node->minor->dev; struct drm_device *dev = entry->dev;
struct v3d_dev *v3d = to_v3d_dev(dev); struct v3d_dev *v3d = to_v3d_dev(dev);
mutex_lock(&v3d->bo_lock); mutex_lock(&v3d->bo_lock);
...@@ -204,8 +204,8 @@ static int v3d_debugfs_bo_stats(struct seq_file *m, void *unused) ...@@ -204,8 +204,8 @@ static int v3d_debugfs_bo_stats(struct seq_file *m, void *unused)
static int v3d_measure_clock(struct seq_file *m, void *unused) static int v3d_measure_clock(struct seq_file *m, void *unused)
{ {
struct drm_info_node *node = (struct drm_info_node *)m->private; struct drm_debugfs_entry *entry = m->private;
struct drm_device *dev = node->minor->dev; struct drm_device *dev = entry->dev;
struct v3d_dev *v3d = to_v3d_dev(dev); struct v3d_dev *v3d = to_v3d_dev(dev);
uint32_t cycles; uint32_t cycles;
int core = 0; int core = 0;
...@@ -236,7 +236,7 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) ...@@ -236,7 +236,7 @@ static int v3d_measure_clock(struct seq_file *m, void *unused)
return 0; return 0;
} }
static const struct drm_info_list v3d_debugfs_list[] = { static const struct drm_debugfs_info v3d_debugfs_list[] = {
{"v3d_ident", v3d_v3d_debugfs_ident, 0}, {"v3d_ident", v3d_v3d_debugfs_ident, 0},
{"v3d_regs", v3d_v3d_debugfs_regs, 0}, {"v3d_regs", v3d_v3d_debugfs_regs, 0},
{"measure_clock", v3d_measure_clock, 0}, {"measure_clock", v3d_measure_clock, 0},
...@@ -246,7 +246,5 @@ static const struct drm_info_list v3d_debugfs_list[] = { ...@@ -246,7 +246,5 @@ static const struct drm_info_list v3d_debugfs_list[] = {
void void
v3d_debugfs_init(struct drm_minor *minor) v3d_debugfs_init(struct drm_minor *minor)
{ {
drm_debugfs_create_files(v3d_debugfs_list, drm_debugfs_add_files(minor->dev, v3d_debugfs_list, ARRAY_SIZE(v3d_debugfs_list));
ARRAY_SIZE(v3d_debugfs_list),
minor->debugfs_root, minor);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment