disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/sti/sti_cursor.c
..
..
@@ -6,9 +6,11 @@
6
6
  *          for STMicroelectronics.
7
7
  */
8
8
 
9
+#include <linux/dma-mapping.h>
9
10
 #include <linux/seq_file.h>
10
11
 
11
12
 #include <drm/drm_atomic.h>
13
+#include <drm/drm_device.h>
12
14
 #include <drm/drm_fb_cma_helper.h>
13
15
 #include <drm/drm_gem_cma_helper.h>
14
16
 
..
..
@@ -45,7 +47,7 @@
45
47
 	void *base;
46
48
 };
47
49
 
48
-/**
50
+/*
49
51
  * STI Cursor structure
50
52
  *
51
53
  * @sti_plane:    sti_plane structure
..
..
@@ -129,17 +131,17 @@
129
131
 	{ "cursor", cursor_dbg_show, 0, NULL },
130
132
 };
131
133
 
132
-static int cursor_debugfs_init(struct sti_cursor *cursor,
133
-			       struct drm_minor *minor)
134
+static void cursor_debugfs_init(struct sti_cursor *cursor,
135
+				struct drm_minor *minor)
134
136
 {
135
137
 	unsigned int i;
136
138
 
137
139
 	for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++)
138
140
 		cursor_debugfs_files[i].data = cursor;
139
141
 
140
-	return drm_debugfs_create_files(cursor_debugfs_files,
141
-					ARRAY_SIZE(cursor_debugfs_files),
142
-					minor->debugfs_root, minor);
142
+	drm_debugfs_create_files(cursor_debugfs_files,
143
+				 ARRAY_SIZE(cursor_debugfs_files),
144
+				 minor->debugfs_root, minor);
143
145
 }
144
146
 
145
147
 static void sti_cursor_argb8888_to_clut8(struct sti_cursor *cursor, u32 *src)
..
..
@@ -332,7 +334,6 @@
332
334
 {
333
335
 	DRM_DEBUG_DRIVER("\n");
334
336
 
335
-	drm_plane_helper_disable(drm_plane, NULL);
336
337
 	drm_plane_cleanup(drm_plane);
337
338
 }
338
339
 
..
..
@@ -341,7 +342,9 @@
341
342
 	struct sti_plane *plane = to_sti_plane(drm_plane);
342
343
 	struct sti_cursor *cursor = to_sti_cursor(plane);
343
344
 
344
-	return cursor_debugfs_init(cursor, drm_plane->dev->primary);
345
+	cursor_debugfs_init(cursor, drm_plane->dev->primary);
346
+
347
+	return 0;
345
348
 }
346
349
 
347
350
 static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {