change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/gpu/drm/qxl/qxl_debugfs.c
..
..
@@ -28,19 +28,18 @@
28
28
  *  Alon Levy <alevy@redhat.com>
29
29
  */
30
30
 
31
-#include <linux/debugfs.h>
31
+#include <drm/drm_debugfs.h>
32
+#include <drm/drm_file.h>
32
33
 
33
-#include <drm/drmP.h>
34
34
 #include "qxl_drv.h"
35
35
 #include "qxl_object.h"
36
-
37
36
 
38
37
 #if defined(CONFIG_DEBUG_FS)
39
38
 static int
40
39
 qxl_debugfs_irq_received(struct seq_file *m, void *data)
41
40
 {
42
41
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
43
-	struct qxl_device *qdev = node->minor->dev->dev_private;
42
+	struct qxl_device *qdev = to_qxl(node->minor->dev);
44
43
 
45
44
 	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
46
45
 	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
..
..
@@ -54,20 +53,20 @@
54
53
 qxl_debugfs_buffers_info(struct seq_file *m, void *data)
55
54
 {
56
55
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
57
-	struct qxl_device *qdev = node->minor->dev->dev_private;
56
+	struct qxl_device *qdev = to_qxl(node->minor->dev);
58
57
 	struct qxl_bo *bo;
59
58
 
60
59
 	list_for_each_entry(bo, &qdev->gem.objects, list) {
61
-		struct reservation_object_list *fobj;
60
+		struct dma_resv_list *fobj;
62
61
 		int rel;
63
62
 
64
63
 		rcu_read_lock();
65
-		fobj = rcu_dereference(bo->tbo.resv->fence);
64
+		fobj = rcu_dereference(bo->tbo.base.resv->fence);
66
65
 		rel = fobj ? fobj->shared_count : 0;
67
66
 		rcu_read_unlock();
68
67
 
69
68
 		seq_printf(m, "size %ld, pc %d, num releases %d\n",
70
-			   (unsigned long)bo->gem_base.size,
69
+			   (unsigned long)bo->tbo.base.size,
71
70
 			   bo->pin_count, rel);
72
71
 	}
73
72
 	return 0;
..
..
@@ -80,36 +79,29 @@
80
79
 #define QXL_DEBUGFS_ENTRIES ARRAY_SIZE(qxl_debugfs_list)
81
80
 #endif
82
81
 
83
-int
82
+void
84
83
 qxl_debugfs_init(struct drm_minor *minor)
85
84
 {
86
85
 #if defined(CONFIG_DEBUG_FS)
87
-	int r;
88
-	struct qxl_device *dev =
89
-		(struct qxl_device *) minor->dev->dev_private;
86
+	struct qxl_device *dev = to_qxl(minor->dev);
90
87
 
91
88
 	drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
92
89
 				 minor->debugfs_root, minor);
93
90
 
94
-	r = qxl_ttm_debugfs_init(dev);
95
-	if (r) {
96
-		DRM_ERROR("Failed to init TTM debugfs\n");
97
-		return r;
98
-	}
91
+	qxl_ttm_debugfs_init(dev);
99
92
 #endif
100
-	return 0;
101
93
 }
102
94
 
103
-int qxl_debugfs_add_files(struct qxl_device *qdev,
104
-			  struct drm_info_list *files,
105
-			  unsigned nfiles)
95
+void qxl_debugfs_add_files(struct qxl_device *qdev,
96
+			   struct drm_info_list *files,
97
+			   unsigned int nfiles)
106
98
 {
107
-	unsigned i;
99
+	unsigned int i;
108
100
 
109
101
 	for (i = 0; i < qdev->debugfs_count; i++) {
110
102
 		if (qdev->debugfs[i].files == files) {
111
103
 			/* Already registered */
112
-			return 0;
104
+			return;
113
105
 		}
114
106
 	}
115
107
 
..
..
@@ -117,7 +109,7 @@
117
109
 	if (i > QXL_DEBUGFS_MAX_COMPONENTS) {
118
110
 		DRM_ERROR("Reached maximum number of debugfs components.\n");
119
111
 		DRM_ERROR("Report so we increase QXL_DEBUGFS_MAX_COMPONENTS.\n");
120
-		return -EINVAL;
112
+		return;
121
113
 	}
122
114
 	qdev->debugfs[qdev->debugfs_count].files = files;
123
115
 	qdev->debugfs[qdev->debugfs_count].num_files = nfiles;
..
..
@@ -127,5 +119,4 @@
127
119
 				 qdev->ddev.primary->debugfs_root,
128
120
 				 qdev->ddev.primary);
129
121
 #endif
130
-	return 0;
131
122
 }