tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/arm: drop use of drmP.h
Drop use of the deprecated drmP.h header file.
While touching the list of include files divide them
into blocks and sort within each block.
Fix fallout.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: malidp@foss.arm.com
Link: https://patchwork.freedesktop.org/patch/msgid/20190804094132.29463-5-sam@ravnborg.org
+41
-20
+7
-5
drivers/gpu/drm/arm/hdlcd_crtc.c
+7
-5
drivers/gpu/drm/arm/hdlcd_crtc.c
···
9
9
* Implementation of a CRTC class for the HDLCD driver.
10
10
*/
11
11
12
-
#include <drm/drmP.h>
12
+
#include <linux/clk.h>
13
+
#include <linux/of_graph.h>
14
+
#include <linux/platform_data/simplefb.h>
15
+
16
+
#include <video/videomode.h>
17
+
13
18
#include <drm/drm_atomic.h>
14
19
#include <drm/drm_atomic_helper.h>
15
20
#include <drm/drm_crtc.h>
···
24
19
#include <drm/drm_of.h>
25
20
#include <drm/drm_plane_helper.h>
26
21
#include <drm/drm_probe_helper.h>
27
-
#include <linux/clk.h>
28
-
#include <linux/of_graph.h>
29
-
#include <linux/platform_data/simplefb.h>
30
-
#include <video/videomode.h>
22
+
#include <drm/drm_vblank.h>
31
23
32
24
#include "hdlcd_drv.h"
33
25
#include "hdlcd_regs.h"
+6
-1
drivers/gpu/drm/arm/hdlcd_drv.c
+6
-1
drivers/gpu/drm/arm/hdlcd_drv.c
···
14
14
#include <linux/clk.h>
15
15
#include <linux/component.h>
16
16
#include <linux/console.h>
17
+
#include <linux/dma-mapping.h>
17
18
#include <linux/list.h>
18
19
#include <linux/of_graph.h>
19
20
#include <linux/of_reserved_mem.h>
21
+
#include <linux/platform_device.h>
20
22
#include <linux/pm_runtime.h>
21
23
22
-
#include <drm/drmP.h>
23
24
#include <drm/drm_atomic_helper.h>
24
25
#include <drm/drm_crtc.h>
26
+
#include <drm/drm_debugfs.h>
27
+
#include <drm/drm_drv.h>
25
28
#include <drm/drm_fb_cma_helper.h>
26
29
#include <drm/drm_fb_helper.h>
27
30
#include <drm/drm_gem_cma_helper.h>
28
31
#include <drm/drm_gem_framebuffer_helper.h>
32
+
#include <drm/drm_irq.h>
29
33
#include <drm/drm_modeset_helper.h>
30
34
#include <drm/drm_of.h>
31
35
#include <drm/drm_probe_helper.h>
36
+
#include <drm/drm_vblank.h>
32
37
33
38
#include "hdlcd_drv.h"
34
39
#include "hdlcd_regs.h"
+7
-4
drivers/gpu/drm/arm/malidp_crtc.c
+7
-4
drivers/gpu/drm/arm/malidp_crtc.c
···
6
6
* ARM Mali DP500/DP550/DP650 driver (crtc operations)
7
7
*/
8
8
9
-
#include <drm/drmP.h>
9
+
#include <linux/clk.h>
10
+
#include <linux/pm_runtime.h>
11
+
12
+
#include <video/videomode.h>
13
+
10
14
#include <drm/drm_atomic.h>
11
15
#include <drm/drm_atomic_helper.h>
12
16
#include <drm/drm_crtc.h>
17
+
#include <drm/drm_print.h>
13
18
#include <drm/drm_probe_helper.h>
14
-
#include <linux/clk.h>
15
-
#include <linux/pm_runtime.h>
16
-
#include <video/videomode.h>
19
+
#include <drm/drm_vblank.h>
17
20
18
21
#include "malidp_drv.h"
19
22
#include "malidp_hw.h"
+5
-3
drivers/gpu/drm/arm/malidp_drv.c
+5
-3
drivers/gpu/drm/arm/malidp_drv.c
···
15
15
#include <linux/pm_runtime.h>
16
16
#include <linux/debugfs.h>
17
17
18
-
#include <drm/drmP.h>
19
18
#include <drm/drm_atomic.h>
20
19
#include <drm/drm_atomic_helper.h>
21
20
#include <drm/drm_crtc.h>
22
-
#include <drm/drm_probe_helper.h>
23
-
#include <drm/drm_fb_helper.h>
21
+
#include <drm/drm_drv.h>
24
22
#include <drm/drm_fb_cma_helper.h>
23
+
#include <drm/drm_fb_helper.h>
24
+
#include <drm/drm_fourcc.h>
25
25
#include <drm/drm_gem_cma_helper.h>
26
26
#include <drm/drm_gem_framebuffer_helper.h>
27
27
#include <drm/drm_modeset_helper.h>
28
28
#include <drm/drm_of.h>
29
+
#include <drm/drm_probe_helper.h>
30
+
#include <drm/drm_vblank.h>
29
31
30
32
#include "malidp_drv.h"
31
33
#include "malidp_mw.h"
+4
-3
drivers/gpu/drm/arm/malidp_drv.h
+4
-3
drivers/gpu/drm/arm/malidp_drv.h
···
9
9
#ifndef __MALIDP_DRV_H__
10
10
#define __MALIDP_DRV_H__
11
11
12
-
#include <drm/drm_writeback.h>
13
-
#include <drm/drm_encoder.h>
14
12
#include <linux/mutex.h>
15
13
#include <linux/wait.h>
16
14
#include <linux/spinlock.h>
17
-
#include <drm/drmP.h>
15
+
16
+
#include <drm/drm_writeback.h>
17
+
#include <drm/drm_encoder.h>
18
+
18
19
#include "malidp_hw.h"
19
20
20
21
#define MALIDP_CONFIG_VALID_INIT 0
+6
-1
drivers/gpu/drm/arm/malidp_hw.c
+6
-1
drivers/gpu/drm/arm/malidp_hw.c
···
9
9
*/
10
10
11
11
#include <linux/clk.h>
12
+
#include <linux/delay.h>
12
13
#include <linux/types.h>
13
14
#include <linux/io.h>
14
-
#include <drm/drmP.h>
15
+
15
16
#include <video/videomode.h>
16
17
#include <video/display_timing.h>
18
+
19
+
#include <drm/drm_fourcc.h>
20
+
#include <drm/drm_vblank.h>
21
+
#include <drm/drm_print.h>
17
22
18
23
#include "malidp_drv.h"
19
24
#include "malidp_hw.h"
+3
-2
drivers/gpu/drm/arm/malidp_mw.c
+3
-2
drivers/gpu/drm/arm/malidp_mw.c
···
5
5
*
6
6
* ARM Mali DP Writeback connector implementation
7
7
*/
8
+
8
9
#include <drm/drm_atomic.h>
9
10
#include <drm/drm_atomic_helper.h>
10
11
#include <drm/drm_crtc.h>
11
-
#include <drm/drm_probe_helper.h>
12
12
#include <drm/drm_fb_cma_helper.h>
13
+
#include <drm/drm_fourcc.h>
13
14
#include <drm/drm_gem_cma_helper.h>
14
-
#include <drm/drmP.h>
15
+
#include <drm/drm_probe_helper.h>
15
16
#include <drm/drm_writeback.h>
16
17
17
18
#include "malidp_drv.h"
+3
-1
drivers/gpu/drm/arm/malidp_planes.c
+3
-1
drivers/gpu/drm/arm/malidp_planes.c
···
7
7
*/
8
8
9
9
#include <linux/iommu.h>
10
+
#include <linux/platform_device.h>
10
11
11
-
#include <drm/drmP.h>
12
12
#include <drm/drm_atomic.h>
13
13
#include <drm/drm_atomic_helper.h>
14
+
#include <drm/drm_drv.h>
14
15
#include <drm/drm_fb_cma_helper.h>
16
+
#include <drm/drm_fourcc.h>
15
17
#include <drm/drm_gem_cma_helper.h>
16
18
#include <drm/drm_gem_framebuffer_helper.h>
17
19
#include <drm/drm_plane_helper.h>