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 9/9] drm/qxl: use new debugfs device-centered functions
Date: Mon, 26 Dec 2022 12:50:29 -0300 [thread overview]
Message-ID: <20221226155029.244355-10-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 qxl_pci_probe(),
before drm_dev_register().
Signed-off-by: Maíra Canal <mcanal@igalia.com>
---
drivers/gpu/drm/qxl/qxl_debugfs.c | 18 ++++++++----------
drivers/gpu/drm/qxl/qxl_drv.c | 5 ++---
drivers/gpu/drm/qxl/qxl_drv.h | 2 +-
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index bdfce1a8f006..fd18a7b193b3 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -38,8 +38,8 @@
static int
qxl_debugfs_irq_received(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct qxl_device *qdev = to_qxl(node->minor->dev);
+ struct drm_debugfs_entry *entry = m->private;
+ struct qxl_device *qdev = to_qxl(entry->dev);
seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
@@ -52,8 +52,8 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
static int
qxl_debugfs_buffers_info(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct qxl_device *qdev = to_qxl(node->minor->dev);
+ struct drm_debugfs_entry *entry = m->private;
+ struct qxl_device *qdev = to_qxl(entry->dev);
struct qxl_bo *bo;
list_for_each_entry(bo, &qdev->gem.objects, list) {
@@ -76,21 +76,19 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data)
return 0;
}
-static struct drm_info_list qxl_debugfs_list[] = {
+static struct drm_debugfs_info qxl_debugfs_list[] = {
{ "irq_received", qxl_debugfs_irq_received, 0, NULL },
{ "qxl_buffers", qxl_debugfs_buffers_info, 0, NULL },
};
#define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
#endif
-void
-qxl_debugfs_init(struct drm_minor *minor)
+void qxl_debugfs_init(struct drm_device *drm)
{
#if defined(CONFIG_DEBUG_FS)
- struct qxl_device *dev = to_qxl(minor->dev);
+ struct qxl_device *dev = to_qxl(drm);
- drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
- minor->debugfs_root, minor);
+ drm_debugfs_add_files(drm, qxl_debugfs_list, QXL_DEBUGFS_ENTRIES);
qxl_ttm_debugfs_init(dev);
#endif
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index a3b83f89e061..3ae2db78f671 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -116,6 +116,8 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret)
goto unload;
+ qxl_debugfs_init(&qdev->ddev);
+
drm_kms_helper_poll_init(&qdev->ddev);
/* Complete initialization. */
@@ -287,9 +289,6 @@ static struct drm_driver qxl_driver = {
.dumb_create = qxl_mode_dumb_create,
.dumb_map_offset = drm_gem_ttm_dumb_map_offset,
-#if defined(CONFIG_DEBUG_FS)
- .debugfs_init = qxl_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_sg_table = qxl_gem_prime_import_sg_table,
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 0868d5d2a839..cb84a3bebcec 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -397,7 +397,7 @@ int qxl_garbage_collect(struct qxl_device *qdev);
/* debugfs */
-void qxl_debugfs_init(struct drm_minor *minor);
+void qxl_debugfs_init(struct drm_device *drm);
void qxl_ttm_debugfs_init(struct qxl_device *qdev);
/* qxl_prime.c */
--
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 ` [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 ` Maíra Canal [this message]
2023-01-06 20:00 ` [PATCH 9/9] drm/qxl: use new debugfs device-centered functions 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-10-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).