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 7/9] drm/omap: use new debugfs device-centered functions
Date: Mon, 26 Dec 2022 12:50:27 -0300 [thread overview]
Message-ID: <20221226155029.244355-8-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_files() 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 omapdrm_init(),
before drm_dev_register().
Signed-off-by: Maíra Canal <mcanal@igalia.com>
---
drivers/gpu/drm/omapdrm/omap_debugfs.c | 29 +++++++++-----------------
drivers/gpu/drm/omapdrm/omap_drv.c | 7 ++++---
drivers/gpu/drm/omapdrm/omap_drv.h | 2 +-
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c
index bfb2ccb40bd1..491aa74eb2ec 100644
--- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
+++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -19,8 +19,8 @@
static int gem_show(struct seq_file *m, void *arg)
{
- 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 omap_drm_private *priv = dev->dev_private;
seq_printf(m, "All Objects:\n");
@@ -33,8 +33,8 @@ static int gem_show(struct seq_file *m, void *arg)
static int mm_show(struct seq_file *m, void *arg)
{
- 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 drm_printer p = drm_seq_file_printer(m);
drm_mm_print(&dev->vma_offset_manager->vm_addr_space_mm, &p);
@@ -45,8 +45,8 @@ static int mm_show(struct seq_file *m, void *arg)
#ifdef CONFIG_DRM_FBDEV_EMULATION
static int fb_show(struct seq_file *m, void *arg)
{
- 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 omap_drm_private *priv = dev->dev_private;
struct drm_framebuffer *fb;
@@ -68,7 +68,7 @@ static int fb_show(struct seq_file *m, void *arg)
#endif
/* list of debufs files that are applicable to all devices */
-static struct drm_info_list omap_debugfs_list[] = {
+static struct drm_debugfs_info omap_debugfs_list[] = {
{"gem", gem_show, 0},
{"mm", mm_show, 0},
#ifdef CONFIG_DRM_FBDEV_EMULATION
@@ -76,21 +76,12 @@ static struct drm_info_list omap_debugfs_list[] = {
#endif
};
-/* list of debugfs files that are specific to devices with dmm/tiler */
-static struct drm_info_list omap_dmm_debugfs_list[] = {
- {"tiler_map", tiler_map_show, 0},
-};
-
-void omap_debugfs_init(struct drm_minor *minor)
+void omap_debugfs_init(struct drm_device *drm)
{
- drm_debugfs_create_files(omap_debugfs_list,
- ARRAY_SIZE(omap_debugfs_list),
- minor->debugfs_root, minor);
+ drm_debugfs_add_files(drm, omap_debugfs_list, ARRAY_SIZE(omap_debugfs_list));
if (dmm_is_available())
- drm_debugfs_create_files(omap_dmm_debugfs_list,
- ARRAY_SIZE(omap_dmm_debugfs_list),
- minor->debugfs_root, minor);
+ drm_debugfs_add_file(drm, "tiler_map", tiler_map_show, NULL);
}
#endif
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index eaf67b9e5f12..06fc1bc0aa07 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -691,9 +691,6 @@ static const struct drm_driver omap_drm_driver = {
DRIVER_ATOMIC | DRIVER_RENDER,
.open = dev_open,
.lastclose = drm_fb_helper_lastclose,
-#ifdef CONFIG_DEBUG_FS
- .debugfs_init = omap_debugfs_init,
-#endif
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
.gem_prime_import = omap_gem_prime_import,
@@ -781,6 +778,10 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
omap_fbdev_init(ddev);
+#ifdef CONFIG_DEBUG_FS
+ omap_debugfs_init(ddev);
+#endif
+
drm_kms_helper_poll_init(ddev);
omap_modeset_enable_external_hpd(ddev);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 825960fd3ea9..1e0d9e10cd6b 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -103,7 +103,7 @@ struct omap_drm_private {
};
-void omap_debugfs_init(struct drm_minor *minor);
+void omap_debugfs_init(struct drm_device *drm);
struct omap_global_state * __must_check omap_get_global_state(struct drm_atomic_state *s);
--
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 new debugfs device-centered functions 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 ` [PATCH 4/9] drm/pl111: " Maíra Canal
2023-01-05 13:54 ` 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 ` Maíra Canal [this message]
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-8-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;
as well as URLs for NNTP newsgroup(s).