drm/armada: drop use of drmP.h
Subsystems (2)
PATCH 1/1 drm/armada: drop use of drmP.h
Drop use of the deprecated drmP.h header file.
While touching the list of include files group them and sort them. Fix fallout from the header file removal.
Signed-off-by Sam Ravnborg <[email protected]>
Cc Russell King <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
The patch is build tested using several configs and several architectures (including arm, arm64, x86).
The patch is based on drm-misc.
If patch is OK, please apply to your tree
as this driver is maintained outside drm-misc.
I am happy to rebase on another tree, just let me know.
Sam
drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- 10 files changed, 49 insertions(+), 12 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +7 -3
@@ -6,15 +6,19 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h> -#include <drm/drmP.h> +#include <drm/drm_atomic.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h"
drivers/gpu/drm/armada/armada_debugfs.c +6 -2
@@ -6,11 +6,15 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/ctype.h> -#include <linux/debugfs.h> #include <linux/module.h> #include <linux/seq_file.h> -#include <drm/drmP.h> +#include <linux/uaccess.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> +#include "armada_crtc.h" #include "armada_drm.h"
drivers/gpu/drm/armada/armada_drm.h +4 -1
@@ -11,11 +11,14 @@#include <linux/kfifo.h> #include <linux/io.h> #include <linux/workqueue.h> -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_mm.h> struct armada_crtc ;struct armada_gem_object ;struct clk ; +struct drm_display_mode ;struct drm_fb_helper ; static inline void
drivers/gpu/drm/armada/armada_drv.c +8 -0
@@ -5,14 +5,22 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/component.h> #include <linux/module.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_prime.h> #include <drm/drm_probe_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_of.h> +#include <drm/drm_vblank.h> +#include "armada_crtc.h" #include "armada_drm.h" #include "armada_gem.h"
drivers/gpu/drm/armada/armada_fb.c +3 -0
@@ -5,9 +5,12 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <drm/drm_modeset_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> +#include "armada_drm.h" #include "armada_fb.h" #include "armada_gem.h"
drivers/gpu/drm/armada/armada_fbdev.c +3 -0
@@ -6,11 +6,14 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/errno.h> #include <linux/kernel.h> #include <linux/module.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h"
drivers/gpu/drm/armada/armada_gem.c +6 -1
@@ -5,12 +5,17 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/dma-buf.h> #include <linux/dma-mapping.h> +#include <linux/mman.h> #include <linux/shmem_fs.h> + +#include <drm/armada_drm.h> +#include <drm/drm_prime.h> +#include "armada_drm.h" #include "armada_gem.h" -#include <drm/armada_drm.h> #include "armada_ioctlP.h" static vm_fault_t armada_gem_vm_fault (struct vm_fault *vmf)
drivers/gpu/drm/armada/armada_overlay.c +5 -3
@@ -6,12 +6,14 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <drm/drmP.h> + +#include <drm/armada_drm.h> #include <drm/drm_atomic.h> -#include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_uapi.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> -#include <drm/armada_drm.h> +#include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h"
drivers/gpu/drm/armada/armada_plane.c +3 -1
@@ -6,10 +6,12 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> +#include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h"
drivers/gpu/drm/armada/armada_trace.h +4 -1
@@ -3,7 +3,10 @@#define ARMADA_TRACE_H #include <linux/tracepoint.h> -#include <drm/drmP.h> + +struct drm_crtc ; +struct drm_framebuffer ; +struct drm_plane ;#undef TRACE_SYSTEM#define TRACE_SYSTEM armada
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel