From patchwork Mon Jan 9 11:55:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 13093330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C85ACC54EBD for ; Mon, 9 Jan 2023 11:57:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D76F910E3F8; Mon, 9 Jan 2023 11:57:25 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DA7510E3F8; Mon, 9 Jan 2023 11:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=+g9FzGLxnzT1FKDArCdNffS+SgvDZ0w4DX89TYpKeAM=; b=pEFOz+rEU0BOR3jdla+myI1BIa Wd/QuANkdR2hZ8aWG9epHuu5HrjbM98GFHTfpPIugZ8GF+WrtH09q2CKfaH9LJxZlzu7Rmr0puK5p 4SOerCnY7QZCyOxZM1lxNVsShPggRa02QZpiS7tTGJhtv8tXDdo6YimBWVGji6T259nIxEU3DyJt7 p3P5lb7mz6z7k6tkQ31JHDPFUqr4DWqnTmrcbozKKOZm0ZTK8OXy6+ekNyF76Fr2hPne7Hh70nuod vkSqeYfdtjvvHDVDlUwN4Yocr8g0ZuVNIsDqXBLFaij+FMmcaEPBDKkV9PwpYlYb2HIziKEyn1xt6 8TL059eQ==; Received: from [187.36.234.139] (helo=bowie..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1pEqm9-003LkJ-5N; Mon, 09 Jan 2023 12:57:13 +0100 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: David Airlie , Daniel Vetter , Lucas Stach , Russell King , Christian Gmeiner , Emma Anholt , Alexey Brodkin , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Tomi Valkeinen Subject: [PATCH v2 7/7] drm/qxl: use new debugfs device-centered functions Date: Mon, 9 Jan 2023 08:55:21 -0300 Message-Id: <20230109115520.40088-8-mcanal@igalia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109115520.40088-1-mcanal@igalia.com> References: <20230109115520.40088-1-mcanal@igalia.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Andr=C3=A9_Almeida?= , Daniel Vetter , =?utf-8?q?Ma=C3=ADra_Canal?= , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Melissa Wen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Moreover, remove the debugfs_init hook and add the debugfs files directly on qxl_pci_probe(), before drm_dev_register(). Reviewed-by: Daniel Vetter Signed-off-by: Maíra Canal --- drivers/gpu/drm/qxl/qxl_debugfs.c | 26 ++++++++++---------------- drivers/gpu/drm/qxl/qxl_drv.c | 5 ++--- drivers/gpu/drm/qxl/qxl_drv.h | 2 +- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c index bdfce1a8f006..c33f1f37dca0 100644 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c @@ -34,12 +34,11 @@ #include "qxl_drv.h" #include "qxl_object.h" -#if defined(CONFIG_DEBUG_FS) -static int +static int __maybe_unused 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)); @@ -49,11 +48,11 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data) return 0; } -static int +static int __maybe_unused 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,22 +75,17 @@ 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 */