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 <[email protected]>
---
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
On Mon, Dec 26, 2022 at 12:50:29PM -0300, Ma?ra Canal wrote:
> 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 <[email protected]>
> ---
> 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)
Again since it's all in the same file I'd drop the #ifdef and use
__maybe_unused. Either way
Reviewed-by: Daniel Vetter <[email protected]>
You could do the same trick for omap drm too I guess, but since it's a bit
across files it's a bit more annoying (and you'd have one cross-file
function call left but *meh*). For the other patches without review yet:
Reviewed-by: Daniel Vetter <[email protected]>
I'd wait another week (because holiday break) for any maintainer feedback
and then push.
-Daniel
> - 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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch