tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/vc4: drop use of drmP.h
Drop use of the deprecated header drmP.h.
Fix so vc4_drv.h is now self-contained, and fixed fall-out in remaining
files.
Divided include files in blocks.
Sorted include files within their blocks.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-7-sam@ravnborg.org
+60
-28
+7
-4
drivers/gpu/drm/vc4/vc4_crtc.c
+7
-4
drivers/gpu/drm/vc4/vc4_crtc.c
···
32
32
* ones that set the clock.
33
33
*/
34
34
35
+
#include <linux/clk.h>
36
+
#include <linux/component.h>
37
+
#include <linux/of_device.h>
38
+
35
39
#include <drm/drm_atomic.h>
36
40
#include <drm/drm_atomic_helper.h>
37
41
#include <drm/drm_atomic_uapi.h>
42
+
#include <drm/drm_fb_cma_helper.h>
38
43
#include <drm/drm_print.h>
39
44
#include <drm/drm_probe_helper.h>
40
-
#include <linux/clk.h>
41
-
#include <drm/drm_fb_cma_helper.h>
42
-
#include <linux/component.h>
43
-
#include <linux/of_device.h>
45
+
#include <drm/drm_vblank.h>
46
+
44
47
#include "vc4_drv.h"
45
48
#include "vc4_regs.h"
46
49
-1
drivers/gpu/drm/vc4/vc4_debugfs.c
-1
drivers/gpu/drm/vc4/vc4_debugfs.c
+6
-1
drivers/gpu/drm/vc4/vc4_drv.c
+6
-1
drivers/gpu/drm/vc4/vc4_drv.c
···
26
26
#include <linux/clk.h>
27
27
#include <linux/component.h>
28
28
#include <linux/device.h>
29
+
#include <linux/dma-mapping.h>
29
30
#include <linux/io.h>
30
31
#include <linux/module.h>
31
32
#include <linux/of_platform.h>
32
33
#include <linux/platform_device.h>
33
34
#include <linux/pm_runtime.h>
35
+
36
+
#include <drm/drm_atomic_helper.h>
37
+
#include <drm/drm_drv.h>
34
38
#include <drm/drm_fb_cma_helper.h>
35
39
#include <drm/drm_fb_helper.h>
36
-
#include <drm/drm_atomic_helper.h>
40
+
#include <drm/drm_vblank.h>
37
41
38
42
#include "uapi/drm/vc4_drm.h"
43
+
39
44
#include "vc4_drv.h"
40
45
#include "vc4_regs.h"
41
46
+12
-5
drivers/gpu/drm/vc4/vc4_drv.h
+12
-5
drivers/gpu/drm/vc4/vc4_drv.h
···
6
6
* published by the Free Software Foundation.
7
7
*/
8
8
9
-
#include <linux/mm_types.h>
10
-
#include <drm/drmP.h>
11
-
#include <drm/drm_util.h>
9
+
#include <linux/delay.h>
10
+
#include <linux/refcount.h>
11
+
#include <linux/uaccess.h>
12
+
13
+
#include <drm/drm_atomic.h>
14
+
#include <drm/drm_debugfs.h>
15
+
#include <drm/drm_device.h>
12
16
#include <drm/drm_encoder.h>
13
17
#include <drm/drm_gem_cma_helper.h>
14
-
#include <drm/drm_atomic.h>
15
-
#include <drm/drm_syncobj.h>
18
+
#include <drm/drm_mm.h>
19
+
#include <drm/drm_modeset_lock.h>
16
20
17
21
#include "uapi/drm/vc4_drm.h"
22
+
23
+
struct drm_device;
24
+
struct drm_gem_object;
18
25
19
26
/* Don't forget to update vc4_bo.c: bo_type_names[] when adding to
20
27
* this.
+10
-7
drivers/gpu/drm/vc4/vc4_dsi.c
+10
-7
drivers/gpu/drm/vc4/vc4_dsi.c
···
29
29
* hopefully present.
30
30
*/
31
31
32
-
#include <drm/drm_atomic_helper.h>
33
-
#include <drm/drm_edid.h>
34
-
#include <drm/drm_mipi_dsi.h>
35
-
#include <drm/drm_of.h>
36
-
#include <drm/drm_panel.h>
37
-
#include <drm/drm_probe_helper.h>
38
-
#include <linux/clk.h>
39
32
#include <linux/clk-provider.h>
33
+
#include <linux/clk.h>
40
34
#include <linux/completion.h>
41
35
#include <linux/component.h>
36
+
#include <linux/dma-mapping.h>
42
37
#include <linux/dmaengine.h>
43
38
#include <linux/i2c.h>
44
39
#include <linux/io.h>
45
40
#include <linux/of_address.h>
46
41
#include <linux/of_platform.h>
47
42
#include <linux/pm_runtime.h>
43
+
44
+
#include <drm/drm_atomic_helper.h>
45
+
#include <drm/drm_edid.h>
46
+
#include <drm/drm_mipi_dsi.h>
47
+
#include <drm/drm_of.h>
48
+
#include <drm/drm_panel.h>
49
+
#include <drm/drm_probe_helper.h>
50
+
48
51
#include "vc4_drv.h"
49
52
#include "vc4_regs.h"
50
53
+2
drivers/gpu/drm/vc4/vc4_gem.c
+2
drivers/gpu/drm/vc4/vc4_gem.c
+4
-1
drivers/gpu/drm/vc4/vc4_hvs.c
+4
-1
drivers/gpu/drm/vc4/vc4_hvs.c
+3
-1
drivers/gpu/drm/vc4/vc4_kms.c
+3
-1
drivers/gpu/drm/vc4/vc4_kms.c
···
14
14
* crtc, HDMI encoder).
15
15
*/
16
16
17
-
#include <drm/drm_crtc.h>
18
17
#include <drm/drm_atomic.h>
19
18
#include <drm/drm_atomic_helper.h>
19
+
#include <drm/drm_crtc.h>
20
20
#include <drm/drm_gem_framebuffer_helper.h>
21
21
#include <drm/drm_plane_helper.h>
22
22
#include <drm/drm_probe_helper.h>
23
+
#include <drm/drm_vblank.h>
24
+
23
25
#include "vc4_drv.h"
24
26
#include "vc4_regs.h"
25
27
+4
-2
drivers/gpu/drm/vc4/vc4_plane.c
+4
-2
drivers/gpu/drm/vc4/vc4_plane.c
···
20
20
21
21
#include <drm/drm_atomic.h>
22
22
#include <drm/drm_atomic_helper.h>
23
-
#include <drm/drm_fb_cma_helper.h>
24
-
#include <drm/drm_plane_helper.h>
25
23
#include <drm/drm_atomic_uapi.h>
24
+
#include <drm/drm_fb_cma_helper.h>
25
+
#include <drm/drm_fourcc.h>
26
26
#include <drm/drm_gem_framebuffer_helper.h>
27
+
#include <drm/drm_plane_helper.h>
27
28
28
29
#include "uapi/drm/vc4_drm.h"
30
+
29
31
#include "vc4_drv.h"
30
32
#include "vc4_regs.h"
31
33
+8
-6
drivers/gpu/drm/vc4/vc4_txp.c
+8
-6
drivers/gpu/drm/vc4/vc4_txp.c
···
7
7
* Boris Brezillon <boris.brezillon@bootlin.com>
8
8
*/
9
9
10
-
#include <drm/drm_atomic_helper.h>
11
-
#include <drm/drm_fb_cma_helper.h>
12
-
#include <drm/drm_edid.h>
13
-
#include <drm/drm_panel.h>
14
-
#include <drm/drm_probe_helper.h>
15
-
#include <drm/drm_writeback.h>
16
10
#include <linux/clk.h>
17
11
#include <linux/component.h>
18
12
#include <linux/of_graph.h>
19
13
#include <linux/of_platform.h>
20
14
#include <linux/pm_runtime.h>
15
+
16
+
#include <drm/drm_atomic_helper.h>
17
+
#include <drm/drm_edid.h>
18
+
#include <drm/drm_fb_cma_helper.h>
19
+
#include <drm/drm_fourcc.h>
20
+
#include <drm/drm_panel.h>
21
+
#include <drm/drm_probe_helper.h>
22
+
#include <drm/drm_writeback.h>
21
23
22
24
#include "vc4_drv.h"
23
25
#include "vc4_regs.h"