[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221226155029.244355-9-mcanal@igalia.com>
Date: Mon, 26 Dec 2022 12:50:28 -0300
From: Maíra Canal <mcanal@...lia.com>
To: David Airlie <airlied@...il.com>, Daniel Vetter <daniel@...ll.ch>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Cc: Melissa Wen <mwen@...lia.com>,
André Almeida <andrealmeid@...lia.com>,
Lucas Stach <l.stach@...gutronix.de>,
Russell King <linux+etnaviv@...linux.org.uk>,
Christian Gmeiner <christian.gmeiner@...il.com>,
etnaviv@...ts.freedesktop.org, noralf@...nnes.org,
Liviu Dudau <liviu.dudau@....com>,
Brian Starkey <brian.starkey@....com>,
Emma Anholt <emma@...olt.net>,
Alexey Brodkin <abrodkin@...opsys.com>,
David Airlie <airlied@...hat.com>,
Gerd Hoffmann <kraxel@...hat.com>,
Gurchetan Singh <gurchetansingh@...omium.org>,
Chia-I Wu <olvaffe@...il.com>,
Tomi Valkeinen <tomba@...nel.org>,
Maíra Canal <mcanal@...lia.com>
Subject: [PATCH 8/9] drm/qxl: remove unused debugfs structure
The current debugfs structure was introduced at f64122c1f6ad and it was
never used by the driver. Considering the addition of more
device-centered functions to the DRM core, remove the current debugfs
structure.
Signed-off-by: Maíra Canal <mcanal@...lia.com>
---
drivers/gpu/drm/qxl/qxl_debugfs.c | 29 -----------------------------
drivers/gpu/drm/qxl/qxl_drv.h | 20 --------------------
2 files changed, 49 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index 2d9ed3b94574..bdfce1a8f006 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -95,32 +95,3 @@ qxl_debugfs_init(struct drm_minor *minor)
qxl_ttm_debugfs_init(dev);
#endif
}
-
-void qxl_debugfs_add_files(struct qxl_device *qdev,
- struct drm_info_list *files,
- unsigned int nfiles)
-{
- unsigned int i;
-
- for (i = 0; i < qdev->debugfs_count; i++) {
- if (qdev->debugfs[i].files == files) {
- /* Already registered */
- return;
- }
- }
-
- i = qdev->debugfs_count + 1;
- if (i > QXL_DEBUGFS_MAX_COMPONENTS) {
- DRM_ERROR("Reached maximum number of debugfs components.\n");
- DRM_ERROR("Report so we increase QXL_DEBUGFS_MAX_COMPONENTS.\n");
- return;
- }
- qdev->debugfs[qdev->debugfs_count].files = files;
- qdev->debugfs[qdev->debugfs_count].num_files = nfiles;
- qdev->debugfs_count = i;
-#if defined(CONFIG_DEBUG_FS)
- drm_debugfs_create_files(files, nfiles,
- qdev->ddev.primary->debugfs_root,
- qdev->ddev.primary);
-#endif
-}
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index ea993d7162e8..0868d5d2a839 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -60,8 +60,6 @@ struct iosys_map;
#define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0
-#define QXL_DEBUGFS_MAX_COMPONENTS 32
-
extern int qxl_num_crtc;
#define QXL_INTERRUPT_MASK (\
@@ -165,14 +163,6 @@ struct qxl_drm_image {
struct list_head chunk_list;
};
-/*
- * Debugfs
- */
-struct qxl_debugfs {
- struct drm_info_list *files;
- unsigned int num_files;
-};
-
struct qxl_device {
struct drm_device ddev;
@@ -228,10 +218,6 @@ struct qxl_device {
wait_queue_head_t io_cmd_event;
struct work_struct client_monitors_config_work;
- /* debugfs */
- struct qxl_debugfs debugfs[QXL_DEBUGFS_MAX_COMPONENTS];
- unsigned int debugfs_count;
-
struct mutex update_area_mutex;
struct idr surf_id_idr;
@@ -256,8 +242,6 @@ struct qxl_device {
#define to_qxl(dev) container_of(dev, struct qxl_device, ddev)
-int qxl_debugfs_fence_init(struct qxl_device *rdev);
-
int qxl_device_init(struct qxl_device *qdev, struct pci_dev *pdev);
void qxl_device_fini(struct qxl_device *qdev);
@@ -430,10 +414,6 @@ void qxl_gem_prime_vunmap(struct drm_gem_object *obj,
/* qxl_irq.c */
int qxl_irq_init(struct qxl_device *qdev);
-void qxl_debugfs_add_files(struct qxl_device *qdev,
- struct drm_info_list *files,
- unsigned int nfiles);
-
int qxl_surface_id_alloc(struct qxl_device *qdev,
struct qxl_bo *surf);
void qxl_surface_id_dealloc(struct qxl_device *qdev,
--
2.38.1
Powered by blists - more mailing lists