disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/sti/sti_gdp.c
..
..
@@ -5,10 +5,14 @@
5
5
  *          Fabien Dessenne <fabien.dessenne@st.com>
6
6
  *          for STMicroelectronics.
7
7
  */
8
+
9
+#include <linux/dma-mapping.h>
8
10
 #include <linux/seq_file.h>
9
11
 
10
12
 #include <drm/drm_atomic.h>
13
+#include <drm/drm_device.h>
11
14
 #include <drm/drm_fb_cma_helper.h>
15
+#include <drm/drm_fourcc.h>
12
16
 #include <drm/drm_gem_cma_helper.h>
13
17
 
14
18
 #include "sti_compositor.h"
..
..
@@ -99,7 +103,7 @@
99
103
 	dma_addr_t btm_field_paddr;
100
104
 };
101
105
 
102
-/**
106
+/*
103
107
  * STI GDP structure
104
108
  *
105
109
  * @sti_plane:          sti_plane structure
..
..
@@ -339,9 +343,10 @@
339
343
 	for (i = 0; i < nb_files; i++)
340
344
 		gdp_debugfs_files[i].data = gdp;
341
345
 
342
-	return drm_debugfs_create_files(gdp_debugfs_files,
343
-					nb_files,
344
-					minor->debugfs_root, minor);
346
+	drm_debugfs_create_files(gdp_debugfs_files,
347
+				 nb_files,
348
+				 minor->debugfs_root, minor);
349
+	return 0;
345
350
 }
346
351
 
347
352
 static int sti_gdp_fourcc2format(int fourcc)
..
..
@@ -517,7 +522,7 @@
517
522
 	/* Allocate all the nodes within a single memory page */
518
523
 	size = sizeof(struct sti_gdp_node) *
519
524
 	    GDP_NODE_PER_FIELD * GDP_NODE_NB_BANK;
520
-	base = dma_alloc_wc(gdp->dev, size, &dma_addr, GFP_KERNEL | GFP_DMA);
525
+	base = dma_alloc_wc(gdp->dev, size, &dma_addr, GFP_KERNEL);
521
526
 
522
527
 	if (!base) {
523
528
 		DRM_ERROR("Failed to allocate memory for GDP node\n");
..
..
@@ -883,7 +888,6 @@
883
888
 {
884
889
 	DRM_DEBUG_DRIVER("\n");
885
890
 
886
-	drm_plane_helper_disable(drm_plane, NULL);
887
891
 	drm_plane_cleanup(drm_plane);
888
892
 }
889
893