tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/rockchip: drop use of drmP.h
Drop use of the deprecated drmP.h header file.
While touching the list of include files move the
blocks so they follow the common pattern:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
Within each block sort the include files.
Add the includes needed to fix build after the removal of drmP.h.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-19-sam@ravnborg.org
+78
-75
+4
-6
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+4
-6
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
···
16
16
#include <linux/reset.h>
17
17
#include <linux/clk.h>
18
18
19
-
#include <drm/drmP.h>
20
-
#include <drm/drm_dp_helper.h>
21
-
#include <drm/drm_of.h>
22
-
#include <drm/drm_panel.h>
23
-
#include <drm/drm_probe_helper.h>
24
-
25
19
#include <video/of_videomode.h>
26
20
#include <video/videomode.h>
27
21
28
22
#include <drm/bridge/analogix_dp.h>
23
+
#include <drm/drm_dp_helper.h>
24
+
#include <drm/drm_of.h>
25
+
#include <drm/drm_panel.h>
26
+
#include <drm/drm_probe_helper.h>
29
27
30
28
#include "rockchip_drm_drv.h"
31
29
#include "rockchip_drm_psr.h"
+11
-12
drivers/gpu/drm/rockchip/cdn-dp-core.c
+11
-12
drivers/gpu/drm/rockchip/cdn-dp-core.c
···
4
4
* Author: Chris Zhong <zyw@rock-chips.com>
5
5
*/
6
6
7
-
#include <drm/drmP.h>
7
+
#include <linux/clk.h>
8
+
#include <linux/component.h>
9
+
#include <linux/extcon.h>
10
+
#include <linux/firmware.h>
11
+
#include <linux/mfd/syscon.h>
12
+
#include <linux/phy/phy.h>
13
+
#include <linux/regmap.h>
14
+
#include <linux/reset.h>
15
+
16
+
#include <sound/hdmi-codec.h>
17
+
8
18
#include <drm/drm_atomic_helper.h>
9
19
#include <drm/drm_dp_helper.h>
10
20
#include <drm/drm_edid.h>
11
21
#include <drm/drm_of.h>
12
22
#include <drm/drm_probe_helper.h>
13
-
14
-
#include <linux/clk.h>
15
-
#include <linux/component.h>
16
-
#include <linux/extcon.h>
17
-
#include <linux/firmware.h>
18
-
#include <linux/regmap.h>
19
-
#include <linux/reset.h>
20
-
#include <linux/mfd/syscon.h>
21
-
#include <linux/phy/phy.h>
22
-
23
-
#include <sound/hdmi-codec.h>
24
23
25
24
#include "cdn-dp-core.h"
26
25
#include "cdn-dp-reg.h"
+1
-1
drivers/gpu/drm/rockchip/cdn-dp-core.h
+1
-1
drivers/gpu/drm/rockchip/cdn-dp-core.h
+5
-4
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+5
-4
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
···
6
6
* Nickey Yang <nickey.yang@rock-chips.com>
7
7
*/
8
8
9
-
#include <drm/drmP.h>
10
-
#include <drm/drm_mipi_dsi.h>
11
-
#include <drm/bridge/dw_mipi_dsi.h>
12
-
#include <drm/drm_of.h>
13
9
#include <linux/clk.h>
14
10
#include <linux/iopoll.h>
15
11
#include <linux/math64.h>
···
14
18
#include <linux/of_device.h>
15
19
#include <linux/pm_runtime.h>
16
20
#include <linux/regmap.h>
21
+
17
22
#include <video/mipi_display.h>
23
+
24
+
#include <drm/bridge/dw_mipi_dsi.h>
25
+
#include <drm/drm_mipi_dsi.h>
26
+
#include <drm/drm_of.h>
18
27
19
28
#include "rockchip_drm_drv.h"
20
29
#include "rockchip_drm_vop.h"
+3
-4
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+3
-4
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
···
10
10
#include <linux/phy/phy.h>
11
11
#include <linux/regmap.h>
12
12
13
-
#include <drm/drm_of.h>
14
-
#include <drm/drmP.h>
15
-
#include <drm/drm_edid.h>
16
-
#include <drm/drm_probe_helper.h>
17
13
#include <drm/bridge/dw_hdmi.h>
14
+
#include <drm/drm_edid.h>
15
+
#include <drm/drm_of.h>
16
+
#include <drm/drm_probe_helper.h>
18
17
19
18
#include "rockchip_drm_drv.h"
20
19
#include "rockchip_drm_vop.h"
+1
-2
drivers/gpu/drm/rockchip/inno_hdmi.c
+1
-2
drivers/gpu/drm/rockchip/inno_hdmi.c
···
15
15
#include <linux/mutex.h>
16
16
#include <linux/of_device.h>
17
17
18
-
#include <drm/drm_of.h>
19
-
#include <drm/drmP.h>
20
18
#include <drm/drm_atomic_helper.h>
21
19
#include <drm/drm_edid.h>
20
+
#include <drm/drm_of.h>
22
21
#include <drm/drm_probe_helper.h>
23
22
24
23
#include "rockchip_drm_drv.h"
+7
-5
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+7
-5
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
···
6
6
* based on exynos_drm_drv.c
7
7
*/
8
8
9
-
#include <drm/drmP.h>
10
-
#include <drm/drm_fb_helper.h>
11
-
#include <drm/drm_gem_cma_helper.h>
12
-
#include <drm/drm_of.h>
13
-
#include <drm/drm_probe_helper.h>
14
9
#include <linux/dma-mapping.h>
15
10
#include <linux/dma-iommu.h>
16
11
#include <linux/pm_runtime.h>
···
15
20
#include <linux/component.h>
16
21
#include <linux/console.h>
17
22
#include <linux/iommu.h>
23
+
24
+
#include <drm/drm_drv.h>
25
+
#include <drm/drm_fb_helper.h>
26
+
#include <drm/drm_gem_cma_helper.h>
27
+
#include <drm/drm_of.h>
28
+
#include <drm/drm_probe_helper.h>
29
+
#include <drm/drm_vblank.h>
18
30
19
31
#include "rockchip_drm_drv.h"
20
32
#include "rockchip_drm_fb.h"
+2
-1
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+2
-1
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
···
5
5
*/
6
6
7
7
#include <linux/kernel.h>
8
+
8
9
#include <drm/drm.h>
9
-
#include <drm/drmP.h>
10
10
#include <drm/drm_atomic.h>
11
11
#include <drm/drm_damage_helper.h>
12
12
#include <drm/drm_fb_helper.h>
13
+
#include <drm/drm_fourcc.h>
13
14
#include <drm/drm_gem_framebuffer_helper.h>
14
15
#include <drm/drm_probe_helper.h>
15
16
+1
-1
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+1
-1
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+5
-5
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+5
-5
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
···
4
4
* Author:Mark Yao <mark.yao@rock-chips.com>
5
5
*/
6
6
7
-
#include <drm/drm.h>
8
-
#include <drm/drmP.h>
9
-
#include <drm/drm_gem.h>
10
-
#include <drm/drm_vma_manager.h>
11
-
12
7
#include <linux/dma-buf.h>
13
8
#include <linux/iommu.h>
9
+
10
+
#include <drm/drm.h>
11
+
#include <drm/drm_gem.h>
12
+
#include <drm/drm_prime.h>
13
+
#include <drm/drm_vma_manager.h>
14
14
15
15
#include "rockchip_drm_drv.h"
16
16
#include "rockchip_drm_gem.h"
-1
drivers/gpu/drm/rockchip/rockchip_drm_psr.c
-1
drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+16
-15
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+16
-15
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
···
4
4
* Author:Mark Yao <mark.yao@rock-chips.com>
5
5
*/
6
6
7
+
#include <linux/clk.h>
8
+
#include <linux/component.h>
9
+
#include <linux/delay.h>
10
+
#include <linux/iopoll.h>
11
+
#include <linux/kernel.h>
12
+
#include <linux/module.h>
13
+
#include <linux/of.h>
14
+
#include <linux/of_device.h>
15
+
#include <linux/overflow.h>
16
+
#include <linux/platform_device.h>
17
+
#include <linux/pm_runtime.h>
18
+
#include <linux/reset.h>
19
+
7
20
#include <drm/drm.h>
8
-
#include <drm/drmP.h>
9
21
#include <drm/drm_atomic.h>
10
22
#include <drm/drm_atomic_uapi.h>
11
23
#include <drm/drm_crtc.h>
12
24
#include <drm/drm_flip_work.h>
25
+
#include <drm/drm_fourcc.h>
13
26
#include <drm/drm_gem_framebuffer_helper.h>
14
27
#include <drm/drm_plane_helper.h>
15
28
#include <drm/drm_probe_helper.h>
29
+
#include <drm/drm_vblank.h>
30
+
16
31
#ifdef CONFIG_DRM_ANALOGIX_DP
17
32
#include <drm/bridge/analogix_dp.h>
18
33
#endif
19
-
20
-
#include <linux/kernel.h>
21
-
#include <linux/module.h>
22
-
#include <linux/platform_device.h>
23
-
#include <linux/clk.h>
24
-
#include <linux/iopoll.h>
25
-
#include <linux/of.h>
26
-
#include <linux/of_device.h>
27
-
#include <linux/pm_runtime.h>
28
-
#include <linux/component.h>
29
-
#include <linux/overflow.h>
30
-
31
-
#include <linux/reset.h>
32
-
#include <linux/delay.h>
33
34
34
35
#include "rockchip_drm_drv.h"
35
36
#include "rockchip_drm_gem.h"
+8
-8
drivers/gpu/drm/rockchip/rockchip_lvds.c
+8
-8
drivers/gpu/drm/rockchip/rockchip_lvds.c
···
6
6
* Sandy Huang <hjc@rock-chips.com>
7
7
*/
8
8
9
-
#include <drm/drmP.h>
10
-
#include <drm/drm_atomic_helper.h>
11
-
#include <drm/drm_dp_helper.h>
12
-
#include <drm/drm_panel.h>
13
-
#include <drm/drm_of.h>
14
-
#include <drm/drm_probe_helper.h>
15
-
16
-
#include <linux/component.h>
17
9
#include <linux/clk.h>
10
+
#include <linux/component.h>
18
11
#include <linux/mfd/syscon.h>
19
12
#include <linux/of_graph.h>
20
13
#include <linux/pinctrl/devinfo.h>
14
+
#include <linux/platform_device.h>
21
15
#include <linux/pm_runtime.h>
22
16
#include <linux/regmap.h>
23
17
#include <linux/reset.h>
18
+
#include <drm/drm_atomic_helper.h>
19
+
20
+
#include <drm/drm_dp_helper.h>
21
+
#include <drm/drm_of.h>
22
+
#include <drm/drm_panel.h>
23
+
#include <drm/drm_probe_helper.h>
24
24
25
25
#include "rockchip_drm_drv.h"
26
26
#include "rockchip_drm_vop.h"
+6
-7
drivers/gpu/drm/rockchip/rockchip_rgb.c
+6
-7
drivers/gpu/drm/rockchip/rockchip_rgb.c
···
5
5
* Sandy Huang <hjc@rock-chips.com>
6
6
*/
7
7
8
-
#include <drm/drmP.h>
9
-
#include <drm/drm_atomic_helper.h>
10
-
#include <drm/drm_dp_helper.h>
11
-
#include <drm/drm_panel.h>
12
-
#include <drm/drm_of.h>
13
-
#include <drm/drm_probe_helper.h>
14
-
15
8
#include <linux/component.h>
16
9
#include <linux/of_graph.h>
10
+
11
+
#include <drm/drm_atomic_helper.h>
12
+
#include <drm/drm_dp_helper.h>
13
+
#include <drm/drm_of.h>
14
+
#include <drm/drm_panel.h>
15
+
#include <drm/drm_probe_helper.h>
17
16
18
17
#include "rockchip_drm_drv.h"
19
18
#include "rockchip_drm_vop.h"
+8
-3
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+8
-3
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
···
4
4
* Author:Mark Yao <mark.yao@rock-chips.com>
5
5
*/
6
6
7
-
#include <drm/drmP.h>
8
-
9
-
#include <linux/kernel.h>
10
7
#include <linux/component.h>
8
+
#include <linux/mod_devicetable.h>
9
+
#include <linux/module.h>
10
+
#include <linux/of.h>
11
+
#include <linux/platform_device.h>
12
+
13
+
#include <drm/drm_fourcc.h>
14
+
#include <drm/drm_plane.h>
15
+
#include <drm/drm_print.h>
11
16
12
17
#include "rockchip_drm_vop.h"
13
18
#include "rockchip_vop_reg.h"