From: "Maíra Canal" <mcanal@igalia.com>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: "Melissa Wen" <mwen@igalia.com>,
"André Almeida" <andrealmeid@igalia.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Russell King" <linux+etnaviv@armlinux.org.uk>,
"Christian Gmeiner" <christian.gmeiner@gmail.com>,
etnaviv@lists.freedesktop.org, noralf@tronnes.org,
"Liviu Dudau" <liviu.dudau@arm.com>,
"Brian Starkey" <brian.starkey@arm.com>,
"Emma Anholt" <emma@anholt.net>,
"Alexey Brodkin" <abrodkin@synopsys.com>,
"David Airlie" <airlied@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
"Chia-I Wu" <olvaffe@gmail.com>,
"Tomi Valkeinen" <tomba@kernel.org>,
"Maíra Canal" <mcanal@igalia.com>
Subject: [PATCH 4/9] drm/pl111: use new debugfs device-centered functions
Date: Mon, 26 Dec 2022 12:50:24 -0300 [thread overview]
Message-ID: <20221226155029.244355-5-mcanal@igalia.com> (raw)
In-Reply-To: <20221226155029.244355-1-mcanal@igalia.com>
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 pl111_amba_probe(),
before drm_dev_register().
Signed-off-by: Maíra Canal <mcanal@igalia.com>
---
drivers/gpu/drm/pl111/pl111_debugfs.c | 15 ++++-----------
drivers/gpu/drm/pl111/pl111_drm.h | 2 +-
drivers/gpu/drm/pl111/pl111_drv.c | 6 ++----
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/pl111/pl111_debugfs.c b/drivers/gpu/drm/pl111/pl111_debugfs.c
index 6744fa16f464..458f69e5435e 100644
--- a/drivers/gpu/drm/pl111/pl111_debugfs.c
+++ b/drivers/gpu/drm/pl111/pl111_debugfs.c
@@ -32,8 +32,8 @@ static const struct {
static int pl111_debugfs_regs(struct seq_file *m, void *unused)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
+ struct drm_debugfs_entry *entry = m->private;
+ struct drm_device *dev = entry->dev;
struct pl111_drm_dev_private *priv = dev->dev_private;
int i;
@@ -46,14 +46,7 @@ static int pl111_debugfs_regs(struct seq_file *m, void *unused)
return 0;
}
-static const struct drm_info_list pl111_debugfs_list[] = {
- {"regs", pl111_debugfs_regs, 0},
-};
-
-void
-pl111_debugfs_init(struct drm_minor *minor)
+void pl111_debugfs_init(struct drm_device *drm)
{
- drm_debugfs_create_files(pl111_debugfs_list,
- ARRAY_SIZE(pl111_debugfs_list),
- minor->debugfs_root, minor);
+ drm_debugfs_add_file(drm, "regs", pl111_debugfs_regs, NULL);
}
diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
index 2a46b5bd8576..7fe74be917f1 100644
--- a/drivers/gpu/drm/pl111/pl111_drm.h
+++ b/drivers/gpu/drm/pl111/pl111_drm.h
@@ -157,6 +157,6 @@ struct pl111_drm_dev_private {
int pl111_display_init(struct drm_device *dev);
irqreturn_t pl111_irq(int irq, void *data);
-void pl111_debugfs_init(struct drm_minor *minor);
+void pl111_debugfs_init(struct drm_device *drm);
#endif /* _PL111_DRM_H_ */
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index 00deba0b7271..c031eb4abc0d 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -228,10 +228,6 @@ static const struct drm_driver pl111_drm_driver = {
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
.gem_prime_import_sg_table = pl111_gem_import_sg_table,
.gem_prime_mmap = drm_gem_prime_mmap,
-
-#if defined(CONFIG_DEBUG_FS)
- .debugfs_init = pl111_debugfs_init,
-#endif
};
static int pl111_amba_probe(struct amba_device *amba_dev,
@@ -304,6 +300,8 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
if (ret != 0)
goto dev_put;
+ pl111_debugfs_init(drm);
+
ret = drm_dev_register(drm, 0);
if (ret < 0)
goto dev_put;
--
2.38.1
next prev parent reply other threads:[~2022-12-26 15:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-26 15:50 [PATCH 0/9] Convert drivers to the " Maíra Canal
2022-12-26 15:50 ` [PATCH 1/9] drm/etnaviv: use " Maíra Canal
2022-12-26 15:50 ` [PATCH 2/9] drm/gud: " Maíra Canal
2023-01-04 13:32 ` Noralf Trønnes
2023-01-06 19:48 ` Maíra Canal
2022-12-26 15:50 ` [PATCH 3/9] drm/arm/hdlcd: " Maíra Canal
2023-01-03 13:48 ` Liviu Dudau
2023-01-06 19:49 ` Maíra Canal
2022-12-26 15:50 ` Maíra Canal [this message]
2023-01-05 13:54 ` [PATCH 4/9] drm/pl111: " kernel test robot
2022-12-26 15:50 ` [PATCH 5/9] drm/arc: " Maíra Canal
2023-01-06 19:54 ` Daniel Vetter
2022-12-26 15:50 ` [PATCH 6/9] drm/virtio: " Maíra Canal
2022-12-26 15:50 ` [PATCH 7/9] drm/omap: " Maíra Canal
2022-12-26 15:50 ` [PATCH 8/9] drm/qxl: remove unused debugfs structure Maíra Canal
2022-12-26 15:50 ` [PATCH 9/9] drm/qxl: use new debugfs device-centered functions Maíra Canal
2023-01-06 20:00 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221226155029.244355-5-mcanal@igalia.com \
--to=mcanal@igalia.com \
--cc=abrodkin@synopsys.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=andrealmeid@igalia.com \
--cc=brian.starkey@arm.com \
--cc=christian.gmeiner@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=etnaviv@lists.freedesktop.org \
--cc=gurchetansingh@chromium.org \
--cc=kraxel@redhat.com \
--cc=l.stach@pengutronix.de \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=mwen@igalia.com \
--cc=noralf@tronnes.org \
--cc=olvaffe@gmail.com \
--cc=tomba@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®