On Tue, Jul 16, 2019 at 2:45 AM Sam Ravnborg <sam@xxxxxxxxxxxx> wrote: > > 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@xxxxxxxxxxxx> > Acked-by: Emil Velikov <emil.velikov@xxxxxxxxxxxxx> > Cc: CK Hu <ck.hu@xxxxxxxxxxxx> > Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Matthias Brugger <matthias.bgg@xxxxxxxxx> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: linux-mediatek@xxxxxxxxxxxxxxxxxxx Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- > drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++++-------- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++++------ > drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 ++++--- > drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 ++++-- > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- > drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++++------ > drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++++----- > 12 files changed, 56 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c > index f33d98b356d6..59de2a46aa49 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c > @@ -3,9 +3,9 @@ > * Copyright (c) 2017 MediaTek Inc. > */ > > -#include <drm/drmP.h> > #include <linux/clk.h> > #include <linux/component.h> > +#include <linux/module.h> > #include <linux/of_device.h> > #include <linux/of_irq.h> > #include <linux/platform_device.h> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c4f07c28c74f..21851756c579 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -3,9 +3,9 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#include <drm/drmP.h> > #include <linux/clk.h> > #include <linux/component.h> > +#include <linux/module.h> > #include <linux/of_device.h> > #include <linux/of_irq.h> > #include <linux/platform_device.h> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 9a6f0a29e43c..405afef31407 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -3,9 +3,9 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#include <drm/drmP.h> > #include <linux/clk.h> > #include <linux/component.h> > +#include <linux/module.h> > #include <linux/of_device.h> > #include <linux/of_irq.h> > #include <linux/platform_device.h> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index bacd989cc9aa..be6d95c5ff25 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -3,21 +3,23 @@ > * Copyright (c) 2014 MediaTek Inc. > * Author: Jie Qiu <jie.qiu@xxxxxxxxxxxx> > */ > -#include <drm/drmP.h> > -#include <drm/drm_crtc.h> > -#include <drm/drm_atomic_helper.h> > -#include <drm/drm_of.h> > -#include <linux/kernel.h> > + > +#include <linux/clk.h> > #include <linux/component.h> > -#include <linux/platform_device.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > #include <linux/of.h> > #include <linux/of_device.h> > #include <linux/of_graph.h> > -#include <linux/interrupt.h> > +#include <linux/platform_device.h> > #include <linux/types.h> > -#include <linux/clk.h> > + > #include <video/videomode.h> > > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_of.h> > + > #include "mtk_dpi_regs.h" > #include "mtk_drm_ddp_comp.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index a9007210dda1..34a731755791 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -3,14 +3,16 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > +#include <linux/clk.h> > +#include <linux/pm_runtime.h> > + > #include <asm/barrier.h> > -#include <drm/drmP.h> > +#include <soc/mediatek/smi.h> > + > #include <drm/drm_atomic_helper.h> > #include <drm/drm_plane_helper.h> > #include <drm/drm_probe_helper.h> > -#include <linux/clk.h> > -#include <linux/pm_runtime.h> > -#include <soc/mediatek/smi.h> > +#include <drm/drm_vblank.h> > > #include "mtk_drm_drv.h" > #include "mtk_drm_crtc.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index b38963f1f2ec..efa85973e46b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -12,7 +12,7 @@ > #include <linux/of_irq.h> > #include <linux/of_platform.h> > #include <linux/platform_device.h> > -#include <drm/drmP.h> > + > #include "mtk_drm_drv.h" > #include "mtk_drm_plane.h" > #include "mtk_drm_ddp_comp.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 2d5caf532431..2ee809a6f3dc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -4,22 +4,26 @@ > * Author: YT SHEN <yt.shen@xxxxxxxxxxxx> > */ > > -#include <drm/drmP.h> > +#include <linux/component.h> > +#include <linux/iommu.h> > +#include <linux/module.h> > +#include <linux/of_address.h> > +#include <linux/of_platform.h> > +#include <linux/pm_runtime.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_cma_helper.h> > #include <drm/drm_of.h> > #include <drm/drm_probe_helper.h> > -#include <linux/component.h> > -#include <linux/iommu.h> > -#include <linux/of_address.h> > -#include <linux/of_platform.h> > -#include <linux/pm_runtime.h> > +#include <drm/drm_vblank.h> > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp.h" > +#include "mtk_drm_ddp.h" > #include "mtk_drm_ddp_comp.h" > #include "mtk_drm_drv.h" > #include "mtk_drm_fb.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c > index 396ba497986d..ae40b080ae47 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c > @@ -3,13 +3,14 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#include <drm/drmP.h> > +#include <linux/dma-buf.h> > +#include <linux/reservation.h> > + > #include <drm/drm_modeset_helper.h> > #include <drm/drm_fb_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_framebuffer_helper.h> > -#include <linux/dma-buf.h> > -#include <linux/reservation.h> > > #include "mtk_drm_drv.h" > #include "mtk_drm_fb.h" > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c > index 0d69698f8173..9434f88c6341 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c > @@ -3,10 +3,12 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#include <drm/drmP.h> > -#include <drm/drm_gem.h> > #include <linux/dma-buf.h> > > +#include <drm/drm_device.h> > +#include <drm/drm_gem.h> > +#include <drm/drm_prime.h> > + > #include "mtk_drm_drv.h" > #include "mtk_drm_gem.h" > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index 42cc9823eaaa..584a9ecadce6 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -4,9 +4,9 @@ > * Author: CK Hu <ck.hu@xxxxxxxxxxxx> > */ > > -#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 <drm/drm_gem_framebuffer_helper.h> > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index b91c4616644a..224afb666881 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -3,12 +3,6 @@ > * Copyright (c) 2015 MediaTek Inc. > */ > > -#include <drm/drmP.h> > -#include <drm/drm_atomic_helper.h> > -#include <drm/drm_mipi_dsi.h> > -#include <drm/drm_panel.h> > -#include <drm/drm_of.h> > -#include <drm/drm_probe_helper.h> > #include <linux/clk.h> > #include <linux/component.h> > #include <linux/iopoll.h> > @@ -17,9 +11,17 @@ > #include <linux/of_platform.h> > #include <linux/phy/phy.h> > #include <linux/platform_device.h> > + > #include <video/mipi_display.h> > #include <video/videomode.h> > > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_mipi_dsi.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > #include "mtk_drm_ddp_comp.h" > > #define DSI_START 0x00 > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index 5d6a9f094df5..ce91b61364eb 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -3,11 +3,7 @@ > * Copyright (c) 2014 MediaTek Inc. > * Author: Jie Qiu <jie.qiu@xxxxxxxxxxxx> > */ > -#include <drm/drmP.h> > -#include <drm/drm_atomic_helper.h> > -#include <drm/drm_crtc.h> > -#include <drm/drm_probe_helper.h> > -#include <drm/drm_edid.h> > + > #include <linux/arm-smccc.h> > #include <linux/clk.h> > #include <linux/delay.h> > @@ -23,7 +19,15 @@ > #include <linux/phy/phy.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > + > #include <sound/hdmi-codec.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > #include "mtk_cec.h" > #include "mtk_hdmi.h" > #include "mtk_hdmi_regs.h" > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
