forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/sti/sti_hqvdp.c
....@@ -5,19 +5,25 @@
55 */
66
77 #include <linux/component.h>
8
+#include <linux/delay.h>
9
+#include <linux/dma-mapping.h>
810 #include <linux/firmware.h>
11
+#include <linux/io.h>
12
+#include <linux/module.h>
913 #include <linux/reset.h>
1014 #include <linux/seq_file.h>
1115
1216 #include <drm/drm_atomic.h>
17
+#include <drm/drm_device.h>
1318 #include <drm/drm_fb_cma_helper.h>
19
+#include <drm/drm_fourcc.h>
1420 #include <drm/drm_gem_cma_helper.h>
1521
1622 #include "sti_compositor.h"
23
+#include "sti_drv.h"
1724 #include "sti_hqvdp_lut.h"
1825 #include "sti_plane.h"
1926 #include "sti_vtg.h"
20
-#include "sti_drv.h"
2127
2228 /* Firmware name */
2329 #define HQVDP_FMW_NAME "hqvdp-stih407.bin"
....@@ -633,16 +639,16 @@
633639 { "hqvdp", hqvdp_dbg_show, 0, NULL },
634640 };
635641
636
-static int hqvdp_debugfs_init(struct sti_hqvdp *hqvdp, struct drm_minor *minor)
642
+static void hqvdp_debugfs_init(struct sti_hqvdp *hqvdp, struct drm_minor *minor)
637643 {
638644 unsigned int i;
639645
640646 for (i = 0; i < ARRAY_SIZE(hqvdp_debugfs_files); i++)
641647 hqvdp_debugfs_files[i].data = hqvdp;
642648
643
- return drm_debugfs_create_files(hqvdp_debugfs_files,
644
- ARRAY_SIZE(hqvdp_debugfs_files),
645
- minor->debugfs_root, minor);
649
+ drm_debugfs_create_files(hqvdp_debugfs_files,
650
+ ARRAY_SIZE(hqvdp_debugfs_files),
651
+ minor->debugfs_root, minor);
646652 }
647653
648654 /**
....@@ -1260,7 +1266,6 @@
12601266 {
12611267 DRM_DEBUG_DRIVER("\n");
12621268
1263
- drm_plane_helper_disable(drm_plane, NULL);
12641269 drm_plane_cleanup(drm_plane);
12651270 }
12661271
....@@ -1269,7 +1274,9 @@
12691274 struct sti_plane *plane = to_sti_plane(drm_plane);
12701275 struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
12711276
1272
- return hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary);
1277
+ hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary);
1278
+
1279
+ return 0;
12731280 }
12741281
12751282 static const struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = {