| Message ID | 20190630052131.6134-1-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] drm/arm: drop use of drmP.h | expand |
On Sun, Jun 30, 2019 at 07:21:31AM +0200, Sam Ravnborg wrote: > 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> > Cc: Liviu Dudau <liviu.dudau@arm.com> Acked-by: 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 > --- > 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've applied the patch to my tree. I'll see if I can squeeze it into drm-next before the merge window opens, otherwise it will get sent with the next batch of patches. Best regards, Liviu > > I am happy to rebase on another tree, just let me know. > > Sam > > drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +++++++----- > drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- > drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- > drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- > drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- > drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- > drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- > drivers/gpu/drm/arm/malidp_planes.c | 4 +++- > 8 files changed, 41 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c > index a3efa28436ea..af67fefed38d 100644 > --- a/drivers/gpu/drm/arm/hdlcd_crtc.c > +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c > @@ -9,7 +9,12 @@ > * Implementation of a CRTC class for the HDLCD driver. > */ > > -#include <drm/drmP.h> > +#include <linux/clk.h> > +#include <linux/of_graph.h> > +#include <linux/platform_data/simplefb.h> > + > +#include <video/videomode.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > @@ -19,10 +24,7 @@ > #include <drm/drm_of.h> > #include <drm/drm_plane_helper.h> > #include <drm/drm_probe_helper.h> > -#include <linux/clk.h> > -#include <linux/of_graph.h> > -#include <linux/platform_data/simplefb.h> > -#include <video/videomode.h> > +#include <drm/drm_vblank.h> > > #include "hdlcd_drv.h" > #include "hdlcd_regs.h" > diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c > index 27c46a2838c5..2e053815b54a 100644 > --- a/drivers/gpu/drm/arm/hdlcd_drv.c > +++ b/drivers/gpu/drm/arm/hdlcd_drv.c > @@ -14,21 +14,26 @@ > #include <linux/clk.h> > #include <linux/component.h> > #include <linux/console.h> > +#include <linux/dma-mapping.h> > #include <linux/list.h> > #include <linux/of_graph.h> > #include <linux/of_reserved_mem.h> > +#include <linux/platform_device.h> > #include <linux/pm_runtime.h> > > -#include <drm/drmP.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > +#include <drm/drm_debugfs.h> > +#include <drm/drm_drv.h> > #include <drm/drm_fb_cma_helper.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_gem_cma_helper.h> > #include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_irq.h> > #include <drm/drm_modeset_helper.h> > #include <drm/drm_of.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > #include "hdlcd_drv.h" > #include "hdlcd_regs.h" > diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c > index db4451260fff..587d94798f5c 100644 > --- a/drivers/gpu/drm/arm/malidp_crtc.c > +++ b/drivers/gpu/drm/arm/malidp_crtc.c > @@ -6,14 +6,17 @@ > * ARM Mali DP500/DP550/DP650 driver (crtc operations) > */ > > -#include <drm/drmP.h> > +#include <linux/clk.h> > +#include <linux/pm_runtime.h> > + > +#include <video/videomode.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > +#include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > -#include <linux/clk.h> > -#include <linux/pm_runtime.h> > -#include <video/videomode.h> > +#include <drm/drm_vblank.h> > > #include "malidp_drv.h" > #include "malidp_hw.h" > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index 3ecdf1311335..a3242971d0d6 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -15,17 +15,19 @@ > #include <linux/pm_runtime.h> > #include <linux/debugfs.h> > > -#include <drm/drmP.h> > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > -#include <drm/drm_probe_helper.h> > -#include <drm/drm_fb_helper.h> > +#include <drm/drm_drv.h> > #include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem_cma_helper.h> > #include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_modeset_helper.h> > #include <drm/drm_of.h> > +#include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > #include "malidp_drv.h" > #include "malidp_mw.h" > diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h > index 0a639af8337e..cdfddfabf2d1 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.h > +++ b/drivers/gpu/drm/arm/malidp_drv.h > @@ -9,12 +9,13 @@ > #ifndef __MALIDP_DRV_H__ > #define __MALIDP_DRV_H__ > > -#include <drm/drm_writeback.h> > -#include <drm/drm_encoder.h> > #include <linux/mutex.h> > #include <linux/wait.h> > #include <linux/spinlock.h> > -#include <drm/drmP.h> > + > +#include <drm/drm_writeback.h> > +#include <drm/drm_encoder.h> > + > #include "malidp_hw.h" > > #define MALIDP_CONFIG_VALID_INIT 0 > diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c > index 50af399d7f6f..0d4c309efbce 100644 > --- a/drivers/gpu/drm/arm/malidp_hw.c > +++ b/drivers/gpu/drm/arm/malidp_hw.c > @@ -9,12 +9,17 @@ > */ > > #include <linux/clk.h> > +#include <linux/delay.h> > #include <linux/types.h> > #include <linux/io.h> > -#include <drm/drmP.h> > + > #include <video/videomode.h> > #include <video/display_timing.h> > > +#include <drm/drm_fourcc.h> > +#include <drm/drm_vblank.h> > +#include <drm/drm_print.h> > + > #include "malidp_drv.h" > #include "malidp_hw.h" > #include "malidp_mw.h" > diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c > index 2e812525025d..22c0847986df 100644 > --- a/drivers/gpu/drm/arm/malidp_mw.c > +++ b/drivers/gpu/drm/arm/malidp_mw.c > @@ -5,13 +5,14 @@ > * > * ARM Mali DP Writeback connector implementation > */ > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > -#include <drm/drm_probe_helper.h> > #include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem_cma_helper.h> > -#include <drm/drmP.h> > +#include <drm/drm_probe_helper.h> > #include <drm/drm_writeback.h> > > #include "malidp_drv.h" > diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c > index 488375bd133d..3c70a53813bf 100644 > --- a/drivers/gpu/drm/arm/malidp_planes.c > +++ b/drivers/gpu/drm/arm/malidp_planes.c > @@ -7,11 +7,13 @@ > */ > > #include <linux/iommu.h> > +#include <linux/platform_device.h> > > -#include <drm/drmP.h> > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > #include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem_cma_helper.h> > #include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_plane_helper.h> > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index a3efa28436ea..af67fefed38d 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -9,7 +9,12 @@ * Implementation of a CRTC class for the HDLCD driver. */ -#include <drm/drmP.h> +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> + +#include <video/videomode.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> @@ -19,10 +24,7 @@ #include <drm/drm_of.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/of_graph.h> -#include <linux/platform_data/simplefb.h> -#include <video/videomode.h> +#include <drm/drm_vblank.h> #include "hdlcd_drv.h" #include "hdlcd_regs.h" diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 27c46a2838c5..2e053815b54a 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -14,21 +14,26 @@ #include <linux/clk.h> #include <linux/component.h> #include <linux/console.h> +#include <linux/dma-mapping.h> #include <linux/list.h> #include <linux/of_graph.h> #include <linux/of_reserved_mem.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_irq.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "hdlcd_drv.h" #include "hdlcd_regs.h" diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c index db4451260fff..587d94798f5c 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -6,14 +6,17 @@ * ARM Mali DP500/DP550/DP650 driver (crtc operations) */ -#include <drm/drmP.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include <video/videomode.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <video/videomode.h> +#include <drm/drm_vblank.h> #include "malidp_drv.h" #include "malidp_hw.h" diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 3ecdf1311335..a3242971d0d6 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -15,17 +15,19 @@ #include <linux/pm_runtime.h> #include <linux/debugfs.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_fb_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "malidp_drv.h" #include "malidp_mw.h" diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h index 0a639af8337e..cdfddfabf2d1 100644 --- a/drivers/gpu/drm/arm/malidp_drv.h +++ b/drivers/gpu/drm/arm/malidp_drv.h @@ -9,12 +9,13 @@ #ifndef __MALIDP_DRV_H__ #define __MALIDP_DRV_H__ -#include <drm/drm_writeback.h> -#include <drm/drm_encoder.h> #include <linux/mutex.h> #include <linux/wait.h> #include <linux/spinlock.h> -#include <drm/drmP.h> + +#include <drm/drm_writeback.h> +#include <drm/drm_encoder.h> + #include "malidp_hw.h" #define MALIDP_CONFIG_VALID_INIT 0 diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c index 50af399d7f6f..0d4c309efbce 100644 --- a/drivers/gpu/drm/arm/malidp_hw.c +++ b/drivers/gpu/drm/arm/malidp_hw.c @@ -9,12 +9,17 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/types.h> #include <linux/io.h> -#include <drm/drmP.h> + #include <video/videomode.h> #include <video/display_timing.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_vblank.h> +#include <drm/drm_print.h> + #include "malidp_drv.h" #include "malidp_hw.h" #include "malidp_mw.h" diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c index 2e812525025d..22c0847986df 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -5,13 +5,14 @@ * * ARM Mali DP Writeback connector implementation */ + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> -#include <drm/drmP.h> +#include <drm/drm_probe_helper.h> #include <drm/drm_writeback.h> #include "malidp_drv.h" diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index 488375bd133d..3c70a53813bf 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -7,11 +7,13 @@ */ #include <linux/iommu.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_plane_helper.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> 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 --- 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/arm/hdlcd_crtc.c | 12 +++++++----- drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- drivers/gpu/drm/arm/malidp_planes.c | 4 +++- 8 files changed, 41 insertions(+), 20 deletions(-)