.. | .. |
---|
5 | 5 | */ |
---|
6 | 6 | |
---|
7 | 7 | #include <linux/component.h> |
---|
| 8 | +#include <linux/delay.h> |
---|
| 9 | +#include <linux/dma-mapping.h> |
---|
8 | 10 | #include <linux/firmware.h> |
---|
| 11 | +#include <linux/io.h> |
---|
| 12 | +#include <linux/module.h> |
---|
9 | 13 | #include <linux/reset.h> |
---|
10 | 14 | #include <linux/seq_file.h> |
---|
11 | 15 | |
---|
12 | 16 | #include <drm/drm_atomic.h> |
---|
| 17 | +#include <drm/drm_device.h> |
---|
13 | 18 | #include <drm/drm_fb_cma_helper.h> |
---|
| 19 | +#include <drm/drm_fourcc.h> |
---|
14 | 20 | #include <drm/drm_gem_cma_helper.h> |
---|
15 | 21 | |
---|
16 | 22 | #include "sti_compositor.h" |
---|
| 23 | +#include "sti_drv.h" |
---|
17 | 24 | #include "sti_hqvdp_lut.h" |
---|
18 | 25 | #include "sti_plane.h" |
---|
19 | 26 | #include "sti_vtg.h" |
---|
20 | | -#include "sti_drv.h" |
---|
21 | 27 | |
---|
22 | 28 | /* Firmware name */ |
---|
23 | 29 | #define HQVDP_FMW_NAME "hqvdp-stih407.bin" |
---|
.. | .. |
---|
633 | 639 | { "hqvdp", hqvdp_dbg_show, 0, NULL }, |
---|
634 | 640 | }; |
---|
635 | 641 | |
---|
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) |
---|
637 | 643 | { |
---|
638 | 644 | unsigned int i; |
---|
639 | 645 | |
---|
640 | 646 | for (i = 0; i < ARRAY_SIZE(hqvdp_debugfs_files); i++) |
---|
641 | 647 | hqvdp_debugfs_files[i].data = hqvdp; |
---|
642 | 648 | |
---|
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); |
---|
646 | 652 | } |
---|
647 | 653 | |
---|
648 | 654 | /** |
---|
.. | .. |
---|
1260 | 1266 | { |
---|
1261 | 1267 | DRM_DEBUG_DRIVER("\n"); |
---|
1262 | 1268 | |
---|
1263 | | - drm_plane_helper_disable(drm_plane, NULL); |
---|
1264 | 1269 | drm_plane_cleanup(drm_plane); |
---|
1265 | 1270 | } |
---|
1266 | 1271 | |
---|
.. | .. |
---|
1269 | 1274 | struct sti_plane *plane = to_sti_plane(drm_plane); |
---|
1270 | 1275 | struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane); |
---|
1271 | 1276 | |
---|
1272 | | - return hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary); |
---|
| 1277 | + hqvdp_debugfs_init(hqvdp, drm_plane->dev->primary); |
---|
| 1278 | + |
---|
| 1279 | + return 0; |
---|
1273 | 1280 | } |
---|
1274 | 1281 | |
---|
1275 | 1282 | static const struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = { |
---|