tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/mediatek: drop use of drmP.h
Drop use of the deprecated drmP.h header file.
While touching the include files divide them up in blocks
in the typical order:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
And sort the includes in the blocks
Add the necessary includes to fix build after removal of drmP.h
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-20-sam@ravnborg.org
+58
-41
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_color.c
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_color.c
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+1
-1
drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+10
-8
drivers/gpu/drm/mediatek/mtk_dpi.c
+10
-8
drivers/gpu/drm/mediatek/mtk_dpi.c
···
3
3
* Copyright (c) 2014 MediaTek Inc.
4
4
* Author: Jie Qiu <jie.qiu@mediatek.com>
5
5
*/
6
-
#include <drm/drmP.h>
7
-
#include <drm/drm_crtc.h>
8
-
#include <drm/drm_atomic_helper.h>
9
-
#include <drm/drm_of.h>
10
-
#include <linux/kernel.h>
6
+
7
+
#include <linux/clk.h>
11
8
#include <linux/component.h>
12
-
#include <linux/platform_device.h>
9
+
#include <linux/interrupt.h>
10
+
#include <linux/kernel.h>
13
11
#include <linux/of.h>
14
12
#include <linux/of_device.h>
15
13
#include <linux/of_graph.h>
16
-
#include <linux/interrupt.h>
14
+
#include <linux/platform_device.h>
17
15
#include <linux/types.h>
18
-
#include <linux/clk.h>
16
+
19
17
#include <video/videomode.h>
18
+
19
+
#include <drm/drm_atomic_helper.h>
20
+
#include <drm/drm_crtc.h>
21
+
#include <drm/drm_of.h>
20
22
21
23
#include "mtk_dpi_regs.h"
22
24
#include "mtk_drm_ddp_comp.h"
+6
-4
drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+6
-4
drivers/gpu/drm/mediatek/mtk_drm_crtc.c
···
3
3
* Copyright (c) 2015 MediaTek Inc.
4
4
*/
5
5
6
+
#include <linux/clk.h>
7
+
#include <linux/pm_runtime.h>
8
+
6
9
#include <asm/barrier.h>
7
-
#include <drm/drmP.h>
10
+
#include <soc/mediatek/smi.h>
11
+
8
12
#include <drm/drm_atomic_helper.h>
9
13
#include <drm/drm_plane_helper.h>
10
14
#include <drm/drm_probe_helper.h>
11
-
#include <linux/clk.h>
12
-
#include <linux/pm_runtime.h>
13
-
#include <soc/mediatek/smi.h>
15
+
#include <drm/drm_vblank.h>
14
16
15
17
#include "mtk_drm_drv.h"
16
18
#include "mtk_drm_crtc.h"
+1
-1
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+1
-1
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+10
-6
drivers/gpu/drm/mediatek/mtk_drm_drv.c
+10
-6
drivers/gpu/drm/mediatek/mtk_drm_drv.c
···
4
4
* Author: YT SHEN <yt.shen@mediatek.com>
5
5
*/
6
6
7
-
#include <drm/drmP.h>
7
+
#include <linux/component.h>
8
+
#include <linux/iommu.h>
9
+
#include <linux/module.h>
10
+
#include <linux/of_address.h>
11
+
#include <linux/of_platform.h>
12
+
#include <linux/pm_runtime.h>
13
+
8
14
#include <drm/drm_atomic.h>
9
15
#include <drm/drm_atomic_helper.h>
16
+
#include <drm/drm_drv.h>
10
17
#include <drm/drm_fb_helper.h>
11
18
#include <drm/drm_gem.h>
12
19
#include <drm/drm_gem_cma_helper.h>
13
20
#include <drm/drm_of.h>
14
21
#include <drm/drm_probe_helper.h>
15
-
#include <linux/component.h>
16
-
#include <linux/iommu.h>
17
-
#include <linux/of_address.h>
18
-
#include <linux/of_platform.h>
19
-
#include <linux/pm_runtime.h>
22
+
#include <drm/drm_vblank.h>
20
23
21
24
#include "mtk_drm_crtc.h"
25
+
#include "mtk_drm_ddp.h"
22
26
#include "mtk_drm_ddp.h"
23
27
#include "mtk_drm_ddp_comp.h"
24
28
#include "mtk_drm_drv.h"
+6
-5
drivers/gpu/drm/mediatek/mtk_drm_fb.c
+6
-5
drivers/gpu/drm/mediatek/mtk_drm_fb.c
···
3
3
* Copyright (c) 2015 MediaTek Inc.
4
4
*/
5
5
6
-
#include <drm/drmP.h>
7
-
#include <drm/drm_modeset_helper.h>
8
-
#include <drm/drm_fb_helper.h>
9
-
#include <drm/drm_gem.h>
10
-
#include <drm/drm_gem_framebuffer_helper.h>
11
6
#include <linux/dma-buf.h>
12
7
#include <linux/reservation.h>
8
+
9
+
#include <drm/drm_modeset_helper.h>
10
+
#include <drm/drm_fb_helper.h>
11
+
#include <drm/drm_fourcc.h>
12
+
#include <drm/drm_gem.h>
13
+
#include <drm/drm_gem_framebuffer_helper.h>
13
14
14
15
#include "mtk_drm_drv.h"
15
16
#include "mtk_drm_fb.h"
+4
-2
drivers/gpu/drm/mediatek/mtk_drm_gem.c
+4
-2
drivers/gpu/drm/mediatek/mtk_drm_gem.c
···
3
3
* Copyright (c) 2015 MediaTek Inc.
4
4
*/
5
5
6
-
#include <drm/drmP.h>
7
-
#include <drm/drm_gem.h>
8
6
#include <linux/dma-buf.h>
7
+
8
+
#include <drm/drm_device.h>
9
+
#include <drm/drm_gem.h>
10
+
#include <drm/drm_prime.h>
9
11
10
12
#include "mtk_drm_drv.h"
11
13
#include "mtk_drm_gem.h"
+1
-1
drivers/gpu/drm/mediatek/mtk_drm_plane.c
+1
-1
drivers/gpu/drm/mediatek/mtk_drm_plane.c
+8
-6
drivers/gpu/drm/mediatek/mtk_dsi.c
+8
-6
drivers/gpu/drm/mediatek/mtk_dsi.c
···
3
3
* Copyright (c) 2015 MediaTek Inc.
4
4
*/
5
5
6
-
#include <drm/drmP.h>
7
-
#include <drm/drm_atomic_helper.h>
8
-
#include <drm/drm_mipi_dsi.h>
9
-
#include <drm/drm_panel.h>
10
-
#include <drm/drm_of.h>
11
-
#include <drm/drm_probe_helper.h>
12
6
#include <linux/clk.h>
13
7
#include <linux/component.h>
14
8
#include <linux/iopoll.h>
···
11
17
#include <linux/of_platform.h>
12
18
#include <linux/phy/phy.h>
13
19
#include <linux/platform_device.h>
20
+
14
21
#include <video/mipi_display.h>
15
22
#include <video/videomode.h>
23
+
24
+
#include <drm/drm_atomic_helper.h>
25
+
#include <drm/drm_mipi_dsi.h>
26
+
#include <drm/drm_of.h>
27
+
#include <drm/drm_panel.h>
28
+
#include <drm/drm_print.h>
29
+
#include <drm/drm_probe_helper.h>
16
30
17
31
#include "mtk_drm_ddp_comp.h"
18
32
+9
-5
drivers/gpu/drm/mediatek/mtk_hdmi.c
+9
-5
drivers/gpu/drm/mediatek/mtk_hdmi.c
···
3
3
* Copyright (c) 2014 MediaTek Inc.
4
4
* Author: Jie Qiu <jie.qiu@mediatek.com>
5
5
*/
6
-
#include <drm/drmP.h>
7
-
#include <drm/drm_atomic_helper.h>
8
-
#include <drm/drm_crtc.h>
9
-
#include <drm/drm_probe_helper.h>
10
-
#include <drm/drm_edid.h>
6
+
11
7
#include <linux/arm-smccc.h>
12
8
#include <linux/clk.h>
13
9
#include <linux/delay.h>
···
19
23
#include <linux/phy/phy.h>
20
24
#include <linux/platform_device.h>
21
25
#include <linux/regmap.h>
26
+
22
27
#include <sound/hdmi-codec.h>
28
+
29
+
#include <drm/drm_atomic_helper.h>
30
+
#include <drm/drm_crtc.h>
31
+
#include <drm/drm_edid.h>
32
+
#include <drm/drm_print.h>
33
+
#include <drm/drm_probe_helper.h>
34
+
23
35
#include "mtk_cec.h"
24
36
#include "mtk_hdmi.h"
25
37
#include "mtk_hdmi_regs.h"