Commit 9aef5867 authored by Sam Ravnborg's avatar Sam Ravnborg

drm/mediatek: drop use of drmP.h

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: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.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
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-20-sam@ravnborg.org
parent c2156ccd
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Copyright (c) 2017 MediaTek Inc. * Copyright (c) 2017 MediaTek Inc.
*/ */
#include <drm/drmP.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Copyright (c) 2015 MediaTek Inc. * Copyright (c) 2015 MediaTek Inc.
*/ */
#include <drm/drmP.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Copyright (c) 2015 MediaTek Inc. * Copyright (c) 2015 MediaTek Inc.
*/ */
#include <drm/drmP.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
...@@ -3,21 +3,23 @@ ...@@ -3,21 +3,23 @@
* Copyright (c) 2014 MediaTek Inc. * Copyright (c) 2014 MediaTek Inc.
* Author: Jie Qiu <jie.qiu@mediatek.com> * Author: Jie Qiu <jie.qiu@mediatek.com>
*/ */
#include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <linux/clk.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_of.h>
#include <linux/kernel.h>
#include <linux/component.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.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/interrupt.h> #include <linux/platform_device.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/clk.h>
#include <video/videomode.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_dpi_regs.h"
#include "mtk_drm_ddp_comp.h" #include "mtk_drm_ddp_comp.h"
......
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
* Copyright (c) 2015 MediaTek Inc. * Copyright (c) 2015 MediaTek Inc.
*/ */
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <asm/barrier.h> #include <asm/barrier.h>
#include <drm/drmP.h> #include <soc/mediatek/smi.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <linux/clk.h> #include <drm/drm_vblank.h>
#include <linux/pm_runtime.h>
#include <soc/mediatek/smi.h>
#include "mtk_drm_drv.h" #include "mtk_drm_drv.h"
#include "mtk_drm_crtc.h" #include "mtk_drm_crtc.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <drm/drmP.h>
#include "mtk_drm_drv.h" #include "mtk_drm_drv.h"
#include "mtk_drm_plane.h" #include "mtk_drm_plane.h"
#include "mtk_drm_ddp_comp.h" #include "mtk_drm_ddp_comp.h"
......
...@@ -4,22 +4,26 @@ ...@@ -4,22 +4,26 @@
* Author: YT SHEN <yt.shen@mediatek.com> * 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.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <linux/component.h> #include <drm/drm_vblank.h>
#include <linux/iommu.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
#include "mtk_drm_crtc.h" #include "mtk_drm_crtc.h"
#include "mtk_drm_ddp.h" #include "mtk_drm_ddp.h"
#include "mtk_drm_ddp.h"
#include "mtk_drm_ddp_comp.h" #include "mtk_drm_ddp_comp.h"
#include "mtk_drm_drv.h" #include "mtk_drm_drv.h"
#include "mtk_drm_fb.h" #include "mtk_drm_fb.h"
......
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
* Copyright (c) 2015 MediaTek Inc. * 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_modeset_helper.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_gem_framebuffer_helper.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_drv.h"
#include "mtk_drm_fb.h" #include "mtk_drm_fb.h"
......
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
* Copyright (c) 2015 MediaTek Inc. * Copyright (c) 2015 MediaTek Inc.
*/ */
#include <drm/drmP.h>
#include <drm/drm_gem.h>
#include <linux/dma-buf.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_drv.h"
#include "mtk_drm_gem.h" #include "mtk_drm_gem.h"
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* Author: CK Hu <ck.hu@mediatek.com> * Author: CK Hu <ck.hu@mediatek.com>
*/ */
#include <drm/drmP.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
......
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
* Copyright (c) 2015 MediaTek Inc. * 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/clk.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
...@@ -17,9 +11,17 @@ ...@@ -17,9 +11,17 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <video/mipi_display.h> #include <video/mipi_display.h>
#include <video/videomode.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" #include "mtk_drm_ddp_comp.h"
#define DSI_START 0x00 #define DSI_START 0x00
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
* Copyright (c) 2014 MediaTek Inc. * Copyright (c) 2014 MediaTek Inc.
* Author: Jie Qiu <jie.qiu@mediatek.com> * 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/arm-smccc.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -23,7 +19,15 @@ ...@@ -23,7 +19,15 @@
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <sound/hdmi-codec.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_cec.h"
#include "mtk_hdmi.h" #include "mtk_hdmi.h"
#include "mtk_hdmi_regs.h" #include "mtk_hdmi_regs.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment