From: Alex Deucher <alexdeucher@gmail.com>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: David Airlie <airlied@linux.ie>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Emil Velikov <emil.velikov@collabora.com>
Subject: Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
Date: Tue, 16 Jul 2019 10:02:53 -0400 [thread overview]
Message-ID: <CADnq5_NL0v941Pg0+=ova-6N4jm1nmFzj9To5oQBRSqeYbzLWA@mail.gmail.com> (raw)
In-Reply-To: <20190716064220.18157-20-sam@ravnborg.org>
On Tue, Jul 16, 2019 at 2:45 AM Sam Ravnborg <sam@ravnborg.org> 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@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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@mediatek.com>
> */
> -#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@mediatek.com>
> */
>
> -#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@mediatek.com>
> */
>
> -#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@mediatek.com>
> */
> -#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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Alex Deucher <alexdeucher@gmail.com>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: David Airlie <airlied@linux.ie>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Emil Velikov <emil.velikov@collabora.com>
Subject: Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
Date: Tue, 16 Jul 2019 10:02:53 -0400 [thread overview]
Message-ID: <CADnq5_NL0v941Pg0+=ova-6N4jm1nmFzj9To5oQBRSqeYbzLWA@mail.gmail.com> (raw)
In-Reply-To: <20190716064220.18157-20-sam@ravnborg.org>
On Tue, Jul 16, 2019 at 2:45 AM Sam Ravnborg <sam@ravnborg.org> 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@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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@mediatek.com>
> */
> -#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@mediatek.com>
> */
>
> -#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@mediatek.com>
> */
>
> -#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@mediatek.com>
> */
> -#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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-16 14:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 14:03 ` Alex Deucher
2019-07-16 14:03 ` Alex Deucher
2019-07-16 14:03 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
2019-07-16 14:06 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
2019-07-16 14:06 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
2019-07-16 8:28 ` Maxime Ripard
2019-07-16 8:28 ` Maxime Ripard
2019-07-16 6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
2019-07-16 14:01 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 09/19] drm/omapdrm: " Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
2019-07-16 14:02 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 11/19] drm/tdfx: " Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 13/19] drm/i810: " Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
2019-07-30 6:03 ` Jyri Sarha
2019-07-30 6:39 ` Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 15/19] drm/i2c/ch7006: " Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 17/19] drm/imx: " Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 18/19] drm/rockchip: " Sam Ravnborg
2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: " Sam Ravnborg
2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 7:44 ` CK Hu
2019-07-16 7:44 ` CK Hu
2019-07-16 14:02 ` Alex Deucher [this message]
2019-07-16 14:02 ` Alex Deucher
2019-07-16 6:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-16 6:50 ` Sam Ravnborg
2019-07-16 6:50 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
[not found] ` <20190716064220.18157-5-sam@ravnborg.org>
2019-07-16 14:06 ` [PATCH v2 04/19] drm/zte: drop use of drmP.h Alex Deucher
[not found] ` <20190716064220.18157-7-sam@ravnborg.org>
2019-07-16 14:07 ` [PATCH v2 06/19] drm/vc4: " Alex Deucher
[not found] ` <20190716064220.18157-9-sam@ravnborg.org>
2019-07-16 14:07 ` [PATCH v2 08/19] drm/udl: " Alex Deucher
2019-07-16 16:36 ` Sam Ravnborg
2019-07-16 17:03 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Eric Anholt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_NL0v941Pg0+=ova-6N4jm1nmFzj9To5oQBRSqeYbzLWA@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.