* [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
@ 2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 7:44 ` CK Hu
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
1 sibling, 2 replies; 5+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: David Airlie, Matthias Brugger, linux-mediatek, Sam Ravnborg,
linux-arm-kernel, Emil Velikov
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
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
[not found] <20190716064220.18157-1-sam@ravnborg.org>
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: drop use of drmP.h Sam Ravnborg
@ 2019-07-16 6:50 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
1 sibling, 1 reply; 5+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:50 UTC (permalink / raw)
To: dri-devel
Cc: Maxime Jourdan, Heiko Stübner, Neil Armstrong, David Airlie,
Alexandru-Cosmin Gheorghe, Eric Anholt, Fabio Estevam,
Jerome Brunet, Deepak Sharma, Maxime Ripard,
Oleksandr Andrushchenko, Kevin Hilman, linux-rockchip,
Chen-Yu Tsai, Tomi Valkeinen, NXP Linux Team, CK Hu,
Philipp Zabel, Francisco Jerez, Eugeniy Paltsev, Dan Carpenter
Copied all recipients on the cover letter.
As the list is long this mail may not hit the mailing lists.
Sam
On Tue, Jul 16, 2019 at 08:42:01AM +0200, Sam Ravnborg wrote:
> This patch set removes a far share of the remaining uses of drmP.h.
> Common for all patches are that the respective files are maintained
> in drm-misc.
> All patches are independent.
>
> Patches have all been build tested with various configs and various
> architectures.
> There are likely introduced a few build issues that randconfig
> build will reveal, but for all configs I have used the build was OK.
>
> This patchset does not conclude the quest to kill all uses
> of drmP.h, but it is a major step towards the goal.
>
> Please review/ack.
> I plan to apply the patches to drm-misc, but feel free
> to do it yourself.
>
> There will be conflicts with the ongoing work on ttm, gem etc.
> But let's deal with the conflicts when they hit us - it
> is simple conflicts in the list of include files.
>
> v2:
> - Removed merged patches
> - Added ack from Emil Velikov to the full series
> - Rebased on top of drm-misc-next
> - Hand-edited the list of Cc: as get_maintainer.pl in some
> cases looks up too much people, due to cross kernel commits
>
> Sam
>
> Sam Ravnborg (19):
> drm/meson: drop use of drmP.h
> drm/v3d: drop use of drmP.h
> drm/pl111: drop use of drmP.h
> drm/zte: drop use of drmP.h
> drm/sun4i: drop use of drmP.h
> drm/vc4: drop use of drmP.h
> drm/r128: drop use of drmP.h
> drm/udl: drop use of drmP.h
> drm/omapdrm: drop use of drmP.h
> drm/selftests: drop use of drmP.h
> drm/tdfx: drop use of drmP.h
> drm/vgem: drop use of drmP.h
> drm/i810: drop use of drmP.h
> drm/tilcdc: drop use of drmP.h
> drm/i2c/ch7006: drop use of drmP.h
> drm/i2c/sil164: drop use of drmP.h
> drm/imx: drop use of drmP.h
> drm/rockchip: drop use of drmP.h
> drm/mediatek: drop use of drmP.h
>
> drivers/gpu/drm/i2c/ch7006_priv.h | 1 -
> drivers/gpu/drm/i2c/sil164_drv.c | 3 ++-
> drivers/gpu/drm/i810/i810_dma.c | 17 +++++++++----
> drivers/gpu/drm/i810/i810_drv.c | 8 +++---
> drivers/gpu/drm/i810/i810_drv.h | 2 ++
> drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 ++++++-----
> drivers/gpu/drm/imx/imx-drm-core.c | 8 ++++--
> drivers/gpu/drm/imx/imx-ldb.c | 22 +++++++++--------
> drivers/gpu/drm/imx/imx-tve.c | 10 +++++---
> drivers/gpu/drm/imx/ipuv3-crtc.c | 8 ++++--
> drivers/gpu/drm/imx/ipuv3-plane.c | 5 ++--
> drivers/gpu/drm/imx/parallel-display.c | 8 +++---
> 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 +++++++----
> drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++------
> drivers/gpu/drm/meson/meson_drv.c | 27 +++++++++------------
> drivers/gpu/drm/meson/meson_drv.h | 11 ++++++---
> drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 ++++++++-------
> drivers/gpu/drm/meson/meson_overlay.c | 13 ++++------
> drivers/gpu/drm/meson/meson_plane.c | 16 +++++-------
> drivers/gpu/drm/meson/meson_registers.h | 2 ++
> drivers/gpu/drm/meson/meson_vclk.c | 7 +++---
> drivers/gpu/drm/meson/meson_vclk.h | 4 +++
> drivers/gpu/drm/meson/meson_venc.c | 10 ++++----
> drivers/gpu/drm/meson/meson_venc.h | 2 ++
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 ++++-----
> drivers/gpu/drm/meson/meson_viu.c | 7 ++----
> drivers/gpu/drm/meson/meson_vpp.c | 7 +++---
> drivers/gpu/drm/meson/meson_vpp.h | 3 +++
> drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ++-
> drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 ++
> drivers/gpu/drm/omapdrm/omap_drv.c | 10 ++++++--
> drivers/gpu/drm/omapdrm/omap_drv.h | 5 ++--
> drivers/gpu/drm/omapdrm/omap_fb.c | 4 +--
> drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++
> drivers/gpu/drm/omapdrm/omap_gem.c | 2 ++
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +++
> drivers/gpu/drm/omapdrm/omap_irq.c | 2 ++
> drivers/gpu/drm/pl111/pl111_debugfs.c | 4 ++-
> drivers/gpu/drm/pl111/pl111_display.c | 6 +++--
> drivers/gpu/drm/pl111/pl111_drm.h | 11 +++++----
> drivers/gpu/drm/pl111/pl111_drv.c | 9 ++++---
> drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++-
> drivers/gpu/drm/pl111/pl111_versatile.c | 9 ++++---
> drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++
> drivers/gpu/drm/r128/r128_ioc32.c | 3 ++-
> drivers/gpu/drm/r128/r128_irq.c | 5 +++-
> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++-----
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 ++++++-------
> drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
> drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 ++++---
> drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 ++--
> drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +--
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 +++++----
> drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 ++-
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +++---
> drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 1 -
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++++------------
> drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 ++++++------
> drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++----
> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 ++++++---
> drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +++++-
> drivers/gpu/drm/sun4i/sun4i_backend.c | 16 ++++++------
> drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +++++-----
> drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +++-
> drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +++++---
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +++++++------
> drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +--
> drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_tcon.c | 20 ++++++++-------
> drivers/gpu/drm/sun4i/sun4i_tv.c | 4 ++-
> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 ++++---
> drivers/gpu/drm/sun4i/sun8i_csc.c | 2 +-
> drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +--
> drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +++++------
> drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 ++---
> drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +-
> drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 -
> drivers/gpu/drm/tdfx/tdfx_drv.c | 11 ++++++---
> drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 ++++++++------
> drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 ++++++++++++---
> drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +++++++++++++-----------
> drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 +
> drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 ++++++---
> drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +--
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +++---
> drivers/gpu/drm/udl/udl_connector.c | 4 +--
> drivers/gpu/drm/udl/udl_connector.h | 2 ++
> drivers/gpu/drm/udl/udl_dmabuf.c | 6 +++--
> drivers/gpu/drm/udl/udl_drv.c | 7 +++++-
> drivers/gpu/drm/udl/udl_drv.h | 8 +++++-
> drivers/gpu/drm/udl/udl_encoder.c | 6 ++---
> drivers/gpu/drm/udl/udl_fb.c | 15 ++++++------
> drivers/gpu/drm/udl/udl_gem.c | 9 ++++---
> drivers/gpu/drm/udl/udl_main.c | 6 +++--
> drivers/gpu/drm/udl/udl_modeset.c | 6 ++---
> drivers/gpu/drm/udl/udl_transfer.c | 4 ---
> drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++-
> drivers/gpu/drm/v3d/v3d_drv.c | 5 +++-
> drivers/gpu/drm/v3d/v3d_drv.h | 13 ++++++++--
> drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++----
> drivers/gpu/drm/v3d/v3d_irq.c | 2 ++
> drivers/gpu/drm/vc4/vc4_crtc.c | 11 ++++++---
> drivers/gpu/drm/vc4/vc4_debugfs.c | 1 -
> drivers/gpu/drm/vc4/vc4_drv.c | 7 +++++-
> drivers/gpu/drm/vc4/vc4_drv.h | 17 +++++++++----
> drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++------
> drivers/gpu/drm/vc4/vc4_gem.c | 2 ++
> drivers/gpu/drm/vc4/vc4_hvs.c | 5 +++-
> drivers/gpu/drm/vc4/vc4_kms.c | 4 ++-
> drivers/gpu/drm/vc4/vc4_plane.c | 6 +++--
> drivers/gpu/drm/vc4/vc4_txp.c | 14 ++++++-----
> drivers/gpu/drm/vc4/vc4_v3d.c | 4 +++
> drivers/gpu/drm/vgem/vgem_drv.c | 11 +++++++--
> drivers/gpu/drm/vgem/vgem_drv.h | 1 -
> drivers/gpu/drm/vgem/vgem_fence.c | 2 ++
> drivers/gpu/drm/zte/zx_drm_drv.c | 3 ++-
> drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
> drivers/gpu/drm/zte/zx_plane.c | 2 +-
> drivers/gpu/drm/zte/zx_tvenc.c | 4 ++-
> drivers/gpu/drm/zte/zx_vga.c | 4 ++-
> drivers/gpu/drm/zte/zx_vou.c | 5 +++-
> include/linux/soc/amlogic/meson-canvas.h | 1 +
> 136 files changed, 626 insertions(+), 427 deletions(-)
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: drop use of drmP.h Sam Ravnborg
@ 2019-07-16 7:44 ` CK Hu
2019-07-16 14:02 ` Alex Deucher
1 sibling, 0 replies; 5+ messages in thread
From: CK Hu @ 2019-07-16 7:44 UTC (permalink / raw)
To: Sam Ravnborg
Cc: David Airlie, dri-devel, linux-mediatek, Matthias Brugger,
linux-arm-kernel, Emil Velikov
Hi, Sam:
On Tue, 2019-07-16 at 08:42 +0200, Sam Ravnborg 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
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Thanks.
>
> 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
> ---
> 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"
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: drop use of drmP.h Sam Ravnborg
2019-07-16 7:44 ` CK Hu
@ 2019-07-16 14:02 ` Alex Deucher
1 sibling, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2019-07-16 14:02 UTC (permalink / raw)
To: Sam Ravnborg
Cc: David Airlie, Maling list - DRI developers, linux-mediatek,
Matthias Brugger, linux-arm-kernel, Emil Velikov
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
2019-07-16 6:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
@ 2019-07-17 10:59 ` Sam Ravnborg
0 siblings, 0 replies; 5+ messages in thread
From: Sam Ravnborg @ 2019-07-17 10:59 UTC (permalink / raw)
To: dri-devel
Cc: Maxime Jourdan, Neil Armstrong, David Airlie,
Alexandru-Cosmin Gheorghe, Jerome Brunet, Deepak Sharma,
Oleksandr Andrushchenko, Kevin Hilman, Maxime Ripard,
Chen-Yu Tsai, Tomi Valkeinen, NXP Linux Team, linux-rockchip,
Eugeniy Paltsev, Dan Carpenter, Robert Tarasov, Emil Lundmark,
Jani Nikula, Jyri Sarha, linux-mediatek, Matthias Brugger,
linux-amlogic
On Tue, Jul 16, 2019 at 08:50:22AM +0200, Sam Ravnborg wrote:
> Copied all recipients on the cover letter.
> As the list is long this mail may not hit the mailing lists.
>
> Sam
>
> On Tue, Jul 16, 2019 at 08:42:01AM +0200, Sam Ravnborg wrote:
> > This patch set removes a far share of the remaining uses of drmP.h.
> > Common for all patches are that the respective files are maintained
> > in drm-misc.
> > All patches are independent.
> >
> > Patches have all been build tested with various configs and various
> > architectures.
> > There are likely introduced a few build issues that randconfig
> > build will reveal, but for all configs I have used the build was OK.
> >
> > This patchset does not conclude the quest to kill all uses
> > of drmP.h, but it is a major step towards the goal.
> >
> > Please review/ack.
> > I plan to apply the patches to drm-misc, but feel free
> > to do it yourself.
> >
> > There will be conflicts with the ongoing work on ttm, gem etc.
> > But let's deal with the conflicts when they hit us - it
> > is simple conflicts in the list of include files.
> >
> > v2:
> > - Removed merged patches
> > - Added ack from Emil Velikov to the full series
> > - Rebased on top of drm-misc-next
> > - Hand-edited the list of Cc: as get_maintainer.pl in some
> > cases looks up too much people, due to cross kernel commits
I have collected the additional r-bs and acks and pushed out the full
series. Thanks for feedback to everyone!
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-17 10:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190716064220.18157-1-sam@ravnborg.org>
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: drop use of drmP.h Sam Ravnborg
2019-07-16 7:44 ` CK Hu
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-17 10:59 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).