@@ -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
-}
@@ -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,