* [PATCH v2 01/19] drm/meson: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
@ 2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 14:03 ` Alex Deucher
2019-07-16 6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: Maxime Jourdan, Neil Armstrong, Kevin Hilman, linux-amlogic,
Emil Velikov, Sam Ravnborg, linux-arm-kernel, Jerome Brunet
Drop use of the deprecated drmP.h header.
While doing so used the opportunity
to clean up a little so includes are now
sorted and removed unused include files.
In a few cases added some forwards to allow header
files to built in different include order.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Maxime Jourdan <mjourdan@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
---
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 +++
include/linux/soc/amlogic/meson-canvas.h | 1 +
16 files changed, 77 insertions(+), 79 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
index aa8ea107524e..3320a74e67fa 100644
--- a/drivers/gpu/drm/meson/meson_crtc.c
+++ b/drivers/gpu/drm/meson/meson_crtc.c
@@ -9,23 +9,21 @@
* Jasper St. Pierre <jstpierre@mecheye.net>
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
#include <linux/bitfield.h>
-#include <drm/drmP.h>
-#include <drm/drm_atomic.h>
+#include <linux/soc/amlogic/meson-canvas.h>
+
#include <drm/drm_atomic_helper.h>
-#include <drm/drm_flip_work.h>
+#include <drm/drm_device.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
#include "meson_crtc.h"
#include "meson_plane.h"
+#include "meson_registers.h"
#include "meson_venc.h"
-#include "meson_vpp.h"
#include "meson_viu.h"
-#include "meson_registers.h"
+#include "meson_vpp.h"
#define MESON_G12A_VIU_OFFSET 0x5ec0
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 37dca83d6eb1..42af49afdd75 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -8,35 +8,30 @@
* Jasper St. Pierre <jstpierre@mecheye.net>
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
#include <linux/component.h>
+#include <linux/module.h>
#include <linux/of_graph.h>
+#include <linux/platform_device.h>
+#include <linux/soc/amlogic/meson-canvas.h>
-#include <drm/drmP.h>
-#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
-#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h>
-#include <drm/drm_flip_work.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_plane_helper.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_probe_helper.h>
-#include <drm/drm_rect.h>
+#include <drm/drm_vblank.h>
+#include "meson_crtc.h"
#include "meson_drv.h"
-#include "meson_plane.h"
#include "meson_overlay.h"
-#include "meson_crtc.h"
+#include "meson_plane.h"
+#include "meson_registers.h"
#include "meson_venc_cvbs.h"
-
-#include "meson_vpp.h"
#include "meson_viu.h"
-#include "meson_venc.h"
-#include "meson_registers.h"
+#include "meson_vpp.h"
#define DRIVER_NAME "meson"
#define DRIVER_DESC "Amlogic Meson DRM driver"
diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
index 7b6593f33dfe..c9aaec1a846e 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -7,11 +7,14 @@
#ifndef __MESON_DRV_H
#define __MESON_DRV_H
-#include <linux/platform_device.h>
-#include <linux/regmap.h>
+#include <linux/device.h>
#include <linux/of.h>
-#include <linux/soc/amlogic/meson-canvas.h>
-#include <drm/drmP.h>
+#include <linux/regmap.h>
+
+struct drm_crtc;
+struct drm_device;
+struct drm_plane;
+struct meson_drm;
struct meson_drm {
struct device *dev;
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index df3f9ddd2234..9f0b08eaf003 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -5,29 +5,30 @@
* Copyright (C) 2015 Amlogic, Inc. All rights reserved.
*/
+#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/component.h>
#include <linux/of_device.h>
#include <linux/of_graph.h>
-#include <linux/reset.h>
-#include <linux/clk.h>
#include <linux/regulator/consumer.h>
+#include <linux/reset.h>
-#include <drm/drmP.h>
+#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_device.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
-#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_print.h>
-#include <uapi/linux/media-bus-format.h>
-#include <uapi/linux/videodev2.h>
+#include <linux/media-bus-format.h>
+#include <linux/videodev2.h>
#include "meson_drv.h"
-#include "meson_venc.h"
-#include "meson_vclk.h"
#include "meson_dw_hdmi.h"
#include "meson_registers.h"
+#include "meson_vclk.h"
+#include "meson_venc.h"
#define DRIVER_NAME "meson-dw-hdmi"
#define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver"
diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c
index cc7c6ae3013d..5aa9dcb4b35e 100644
--- a/drivers/gpu/drm/meson/meson_overlay.c
+++ b/drivers/gpu/drm/meson/meson_overlay.c
@@ -5,24 +5,21 @@
* Copyright (C) 2015 Amlogic, Inc. All rights reserved.
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
#include <linux/bitfield.h>
-#include <linux/platform_device.h>
-#include <drm/drmP.h>
+
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_device.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_rect.h>
#include "meson_overlay.h"
-#include "meson_vpp.h"
-#include "meson_viu.h"
#include "meson_registers.h"
+#include "meson_viu.h"
+#include "meson_vpp.h"
/* VD1_IF0_GEN_REG */
#define VD_URGENT_CHROMA BIT(28)
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 7a7e88dadd0b..80b8d70c4d75 100644
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -9,24 +9,20 @@
* Jasper St. Pierre <jstpierre@mecheye.net>
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
#include <linux/bitfield.h>
-#include <linux/platform_device.h>
-#include <drm/drmP.h>
+
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
-#include <drm/drm_plane_helper.h>
-#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_device.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_rect.h>
+#include <drm/drm_plane_helper.h>
#include "meson_plane.h"
-#include "meson_vpp.h"
-#include "meson_viu.h"
#include "meson_registers.h"
+#include "meson_viu.h"
/* OSD_SCI_WH_M1 */
#define SCI_WH_M1_W(w) FIELD_PREP(GENMASK(28, 16), w)
diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
index 410e324d6f93..057453ce027c 100644
--- a/drivers/gpu/drm/meson/meson_registers.h
+++ b/drivers/gpu/drm/meson/meson_registers.h
@@ -6,6 +6,8 @@
#ifndef __MESON_REGISTERS_H
#define __MESON_REGISTERS_H
+#include <linux/io.h>
+
/* Shift all registers by 2 */
#define _REG(reg) ((reg) << 2)
diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
index 26732f038d19..8abff51f937d 100644
--- a/drivers/gpu/drm/meson/meson_vclk.c
+++ b/drivers/gpu/drm/meson/meson_vclk.c
@@ -5,9 +5,10 @@
* Copyright (C) 2015 Amlogic, Inc. All rights reserved.
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/export.h>
+
+#include <drm/drm_print.h>
+
#include "meson_drv.h"
#include "meson_vclk.h"
diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h
index ed993d20abda..b62125540aef 100644
--- a/drivers/gpu/drm/meson/meson_vclk.h
+++ b/drivers/gpu/drm/meson/meson_vclk.h
@@ -9,6 +9,10 @@
#ifndef __MESON_VCLK_H
#define __MESON_VCLK_H
+#include <drm/drm_modes.h>
+
+struct meson_drm;
+
enum {
MESON_VCLK_TARGET_CVBS = 0,
MESON_VCLK_TARGET_HDMI = 1,
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 7b7a0d8d737c..3d4791798ae0 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -5,14 +5,14 @@
* Copyright (C) 2015 Amlogic, Inc. All rights reserved.
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/export.h>
+
+#include <drm/drm_modes.h>
+
#include "meson_drv.h"
+#include "meson_registers.h"
#include "meson_venc.h"
#include "meson_vpp.h"
-#include "meson_vclk.h"
-#include "meson_registers.h"
/**
* DOC: Video Encoder
diff --git a/drivers/gpu/drm/meson/meson_venc.h b/drivers/gpu/drm/meson/meson_venc.h
index 985642a1678e..576768bdd08d 100644
--- a/drivers/gpu/drm/meson/meson_venc.h
+++ b/drivers/gpu/drm/meson/meson_venc.h
@@ -14,6 +14,8 @@
#ifndef __MESON_VENC_H
#define __MESON_VENC_H
+struct drm_display_mode;
+
enum {
MESON_VENC_MODE_NONE = 0,
MESON_VENC_MODE_CVBS_PAL,
diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
index 6313a519f257..45a467f10b9b 100644
--- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
@@ -9,19 +9,18 @@
* Jasper St. Pierre <jstpierre@mecheye.net>
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/of_graph.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_device.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_print.h>
-#include "meson_venc_cvbs.h"
-#include "meson_venc.h"
-#include "meson_vclk.h"
#include "meson_registers.h"
+#include "meson_vclk.h"
+#include "meson_venc_cvbs.h"
/* HHI VDAC Registers */
#define HHI_VDAC_CNTL0 0x2F4 /* 0xbd offset in data sheet */
diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
index 4b2b3024d371..9f8a450d50d5 100644
--- a/drivers/gpu/drm/meson/meson_viu.c
+++ b/drivers/gpu/drm/meson/meson_viu.c
@@ -6,13 +6,10 @@
* Copyright (C) 2014 Endless Mobile
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/export.h>
+
#include "meson_drv.h"
#include "meson_viu.h"
-#include "meson_vpp.h"
-#include "meson_venc.h"
#include "meson_registers.h"
/**
diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
index bfee30fa6e34..cbe6cf46e541 100644
--- a/drivers/gpu/drm/meson/meson_vpp.c
+++ b/drivers/gpu/drm/meson/meson_vpp.c
@@ -6,12 +6,11 @@
* Copyright (C) 2014 Endless Mobile
*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/export.h>
+
#include "meson_drv.h"
-#include "meson_vpp.h"
#include "meson_registers.h"
+#include "meson_vpp.h"
/**
* DOC: Video Post Processing
diff --git a/drivers/gpu/drm/meson/meson_vpp.h b/drivers/gpu/drm/meson/meson_vpp.h
index 9fc82db8a12d..afc9553ed8d3 100644
--- a/drivers/gpu/drm/meson/meson_vpp.h
+++ b/drivers/gpu/drm/meson/meson_vpp.h
@@ -9,6 +9,9 @@
#ifndef __MESON_VPP_H
#define __MESON_VPP_H
+struct drm_rect;
+struct meson_drm;
+
/* Mux VIU/VPP to ENCI */
#define MESON_VIU_VPP_MUX_ENCI 0x5
/* Mux VIU/VPP to ENCP */
diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h
index b4dde2fbeb3f..0cb2a6050d1f 100644
--- a/include/linux/soc/amlogic/meson-canvas.h
+++ b/include/linux/soc/amlogic/meson-canvas.h
@@ -20,6 +20,7 @@
#define MESON_CANVAS_ENDIAN_SWAP64 0x7
#define MESON_CANVAS_ENDIAN_SWAP128 0xf
+struct device;
struct meson_canvas;
/**
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 05/19] drm/sun4i: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
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 8:28 ` Maxime Ripard
2019-07-16 6:42 ` [PATCH v2 17/19] drm/imx: " Sam Ravnborg
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: Maxime Ripard, David Airlie, Chen-Yu Tsai, Daniel Vetter,
Sam Ravnborg, linux-arm-kernel, Emil Velikov
Drop use of the deprecated drmP.h header file.
While touching the list of include file, use the typical order of the
blocks:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
Within each block, sort the files.
Include necessary files to fix build after the drmP.h removal.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-arm-kernel@lists.infradead.org
---
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 -
18 files changed, 71 insertions(+), 59 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 78d8c3afe825..4e29f4fe4a05 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -6,21 +6,23 @@
* Maxime Ripard <maxime.ripard@free-electrons.com>
*/
-#include <drm/drmP.h>
+#include <linux/component.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/platform_device.h>
+#include <linux/reset.h>
+
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
-#include <linux/component.h>
-#include <linux/list.h>
-#include <linux/of_device.h>
-#include <linux/of_graph.h>
-#include <linux/reset.h>
-
#include "sun4i_backend.h"
#include "sun4i_drv.h"
#include "sun4i_frontend.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index 9d8504f813a4..3a153648b369 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -6,12 +6,6 @@
* Maxime Ripard <maxime.ripard@free-electrons.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_modes.h>
-#include <drm/drm_probe_helper.h>
-
#include <linux/clk-provider.h>
#include <linux/ioport.h>
#include <linux/of_address.h>
@@ -21,6 +15,13 @@
#include <video/videomode.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_modes.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
#include "sun4i_backend.h"
#include "sun4i_crtc.h"
#include "sun4i_drv.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index d0fda2bf8224..a5757b11b730 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -8,16 +8,19 @@
#include <linux/component.h>
#include <linux/kfifo.h>
+#include <linux/module.h>
#include <linux/of_graph.h>
#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.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_of.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
#include "sun4i_drv.h"
#include "sun4i_frontend.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
index 35c040716680..1568f68f9a9e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
@@ -9,7 +9,6 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drmP.h>
#include "sun4i_drv.h"
#include "sun4i_framebuffer.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.c b/drivers/gpu/drm/sun4i/sun4i_frontend.c
index 346c8071bd38..ec2a032e07b9 100644
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.c
@@ -3,9 +3,6 @@
* Copyright (C) 2017 Free Electrons
* Maxime Ripard <maxime.ripard@free-electrons.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_gem_cma_helper.h>
-#include <drm/drm_fb_cma_helper.h>
#include <linux/clk.h>
#include <linux/component.h>
@@ -16,6 +13,13 @@
#include <linux/regmap.h>
#include <linux/reset.h>
+#include <drm/drm_device.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_plane.h>
+
#include "sun4i_drv.h"
#include "sun4i_frontend.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 9c3f99339b82..b2df76addc75 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -5,23 +5,24 @@
* Maxime Ripard <maxime.ripard@free-electrons.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_edid.h>
-#include <drm/drm_encoder.h>
-#include <drm/drm_of.h>
-#include <drm/drm_panel.h>
-
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/iopoll.h>
+#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/reset.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_encoder.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
#include "sun4i_backend.h"
#include "sun4i_crtc.h"
#include "sun4i_drv.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index e72dd4de90ce..c04f4ba0d69d 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -7,9 +7,8 @@
*/
#include <drm/drm_atomic_helper.h>
-#include <drm/drm_plane_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drmP.h>
+#include <drm/drm_plane_helper.h>
#include "sun4i_backend.h"
#include "sun4i_frontend.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
index 3a3ba99fed22..7fbf425acb55 100644
--- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
+++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
@@ -6,10 +6,10 @@
#include <linux/clk.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "sun4i_crtc.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index a901ec689b62..aac56983f208 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -8,10 +8,10 @@
#include <linux/clk.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "sun4i_crtc.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 3e97953628ed..690aeb822704 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -6,7 +6,15 @@
* Maxime Ripard <maxime.ripard@free-electrons.com>
*/
-#include <drm/drmP.h>
+#include <linux/component.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
@@ -14,18 +22,12 @@
#include <drm/drm_modes.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
#include <uapi/drm/drm_mode.h>
-#include <linux/component.h>
-#include <linux/ioport.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/of_irq.h>
-#include <linux/regmap.h>
-#include <linux/reset.h>
-
#include "sun4i_crtc.h"
#include "sun4i_dotclock.h"
#include "sun4i_drv.h"
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index f998153c141f..39c15282e448 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -8,14 +8,16 @@
#include <linux/clk.h>
#include <linux/component.h>
+#include <linux/module.h>
#include <linux/of_address.h>
+#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/reset.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "sun4i_crtc.h"
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index a1fc8b520985..472f73985deb 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -9,19 +9,20 @@
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/crc-ccitt.h>
+#include <linux/module.h>
#include <linux/of_address.h>
+#include <linux/phy/phy-mipi-dphy.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/slab.h>
-#include <linux/phy/phy.h>
-#include <linux/phy/phy-mipi-dphy.h>
-
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_mipi_dsi.h>
#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "sun4i_crtc.h"
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
index b8c059f1a118..00706a494c89 100644
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
@@ -3,7 +3,7 @@
* Copyright (C) Jernej Skrabec <jernej.skrabec@siol.net>
*/
-#include <drm/drmP.h>
+#include <drm/drm_print.h>
#include "sun8i_csc.h"
#include "sun8i_mixer.h"
diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
index 39d8509d96a0..8ca5af0c912f 100644
--- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
@@ -8,9 +8,8 @@
#include <linux/of_device.h>
#include <linux/platform_device.h>
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
+#include <drm/drm_of.h>
#include "sun8i_dw_hdmi.h"
#include "sun8i_tcon_top.h"
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index c2eedf58bf4b..8b803eb903b8 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -7,7 +7,13 @@
* Copyright (C) 2015 NextThing Co
*/
-#include <drm/drmP.h>
+#include <linux/component.h>
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/reset.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_cma_helper.h>
@@ -15,12 +21,6 @@
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
-#include <linux/component.h>
-#include <linux/dma-mapping.h>
-#include <linux/of_device.h>
-#include <linux/of_graph.h>
-#include <linux/reset.h>
-
#include "sun4i_drv.h"
#include "sun8i_mixer.h"
#include "sun8i_ui_layer.h"
diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
index 3267d0f9b9b2..75d8e60c149d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
+++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
@@ -1,18 +1,18 @@
// SPDX-License-Identifier: GPL-2.0+
/* Copyright (c) 2018 Jernej Skrabec <jernej.skrabec@siol.net> */
-#include <drm/drmP.h>
-
-#include <dt-bindings/clock/sun8i-tcon-top.h>
#include <linux/bitfield.h>
#include <linux/component.h>
#include <linux/device.h>
+#include <linux/io.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of_graph.h>
#include <linux/platform_device.h>
+#include <dt-bindings/clock/sun8i-tcon-top.h>
+
#include "sun8i_tcon_top.h"
struct sun8i_tcon_top_quirks {
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index dd2a1c851939..c87fd842918e 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -13,11 +13,11 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.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>
#include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
#include "sun8i_ui_layer.h"
#include "sun8i_mixer.h"
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index bd0e6a52d1d8..1bdcbf53dd20 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -11,7 +11,6 @@
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
#include "sun8i_vi_layer.h"
#include "sun8i_mixer.h"
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 17/19] drm/imx: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
2019-07-16 6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
@ 2019-07-16 6:42 ` Sam Ravnborg
2019-07-16 6:42 ` [PATCH v2 18/19] drm/rockchip: " Sam Ravnborg
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: Fabio Estevam, Philipp Zabel, David Airlie, Sam Ravnborg,
Sascha Hauer, NXP Linux Team, Daniel Vetter, Shawn Guo,
Pengutronix Kernel Team, linux-arm-kernel, Emil Velikov
Drop use of the deprecated drmP.h header file.
While touching the include files divide them in blocks and sort the
include files within each block.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org
---
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 +++++---
7 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 06393cd1067d..5a3ad6fc8ea7 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -3,19 +3,21 @@
*
* derived from imx-hdmi.c(renamed to bridge/dw_hdmi.c now)
*/
-#include <linux/module.h>
-#include <linux/platform_device.h>
+
#include <linux/component.h>
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
-#include <drm/bridge/dw_hdmi.h>
-#include <video/imx-ipu-v3.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
#include <linux/regmap.h>
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
+
+#include <video/imx-ipu-v3.h>
+
+#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_encoder_slave.h>
+#include <drm/drm_of.h>
#include "imx-drm.h"
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index bdefaa1635eb..da87c70e413b 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -4,14 +4,18 @@
*
* Copyright (C) 2011 Sascha Hauer, Pengutronix
*/
+
#include <linux/component.h>
#include <linux/device.h>
#include <linux/dma-buf.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <drm/drmP.h>
+
+#include <video/imx-ipu-v3.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_fb_helper.h>
#include <drm/drm_gem_cma_helper.h>
@@ -19,7 +23,7 @@
#include <drm/drm_of.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
-#include <video/imx-ipu-v3.h>
+#include <drm/drm_vblank.h>
#include "imx-drm.h"
#include "ipuv3-plane.h"
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 383733302280..de62a4cd4827 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -5,25 +5,27 @@
* Copyright (C) 2012 Sascha Hauer, Pengutronix
*/
-#include <linux/module.h>
#include <linux/clk.h>
#include <linux/component.h>
-#include <drm/drmP.h>
-#include <drm/drm_atomic.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_of.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_probe_helper.h>
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
+#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of_graph.h>
-#include <video/of_display_timing.h>
-#include <video/of_videomode.h>
#include <linux/regmap.h>
#include <linux/videodev2.h>
+#include <video/of_display_timing.h>
+#include <video/of_videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
#include "imx-drm.h"
#define DRIVER_NAME "imx-ldb"
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index e725af8a0025..649515868f86 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -5,20 +5,22 @@
* Copyright (C) 2013 Philipp Zabel, Pengutronix
*/
-#include <linux/clk.h>
#include <linux/clk-provider.h>
+#include <linux/clk.h>
#include <linux/component.h>
-#include <linux/module.h>
#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/spinlock.h>
#include <linux/videodev2.h>
-#include <drm/drmP.h>
+
+#include <video/imx-ipu-v3.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_probe_helper.h>
-#include <video/imx-ipu-v3.h>
#include "imx-drm.h"
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 9cc1d678674f..4b575450c127 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -4,21 +4,25 @@
*
* Copyright (C) 2011 Sascha Hauer, Pengutronix
*/
+
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/device.h>
+#include <linux/dma-mapping.h>
#include <linux/errno.h>
#include <linux/export.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <drm/drmP.h>
+
+#include <video/imx-ipu-v3.h>
+
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
-#include <video/imx-ipu-v3.h>
#include "imx-drm.h"
#include "ipuv3-plane.h"
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 2c19054ed570..8bb1c4c96d20 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -5,15 +5,16 @@
* Copyright (C) 2013 Philipp Zabel, Pengutronix
*/
-#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.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>
-#include "video/imx-ipu-v3.h"
+#include <video/imx-ipu-v3.h>
+
#include "imx-drm.h"
#include "ipuv3-plane.h"
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 1a76de1e8e7b..2e51b2fade75 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -7,14 +7,16 @@
#include <linux/component.h>
#include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/platform_device.h>
+#include <linux/videodev2.h>
+
+#include <video/of_display_timing.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
#include <drm/drm_probe_helper.h>
-#include <linux/videodev2.h>
-#include <video/of_display_timing.h>
#include "imx-drm.h"
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 18/19] drm/rockchip: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
` (2 preceding siblings ...)
2019-07-16 6:42 ` [PATCH v2 17/19] drm/imx: " 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:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
5 siblings, 0 replies; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: Heiko Stübner, David Airlie, Sandy Huang, linux-rockchip,
Daniel Vetter, Sam Ravnborg, linux-arm-kernel, Emil Velikov
Drop use of the deprecated drmP.h header file.
While touching the list of include files move the
blocks so they follow the common pattern:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
Within each block sort the include files.
Add the includes needed to fix build after the removal of drmP.h.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
---
.../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 +-
.../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 +++++--
15 files changed, 71 insertions(+), 68 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 95e5c517a15f..bd99bc948ea5 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -16,16 +16,14 @@
#include <linux/reset.h>
#include <linux/clk.h>
-#include <drm/drmP.h>
-#include <drm/drm_dp_helper.h>
-#include <drm/drm_of.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_probe_helper.h>
-
#include <video/of_videomode.h>
#include <video/videomode.h>
#include <drm/bridge/analogix_dp.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
#include "rockchip_drm_drv.h"
#include "rockchip_drm_psr.h"
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 8c32c32be85c..d505ea7d5384 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -4,24 +4,23 @@
* Author: Chris Zhong <zyw@rock-chips.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_dp_helper.h>
-#include <drm/drm_edid.h>
-#include <drm/drm_of.h>
-#include <drm/drm_probe_helper.h>
-
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/extcon.h>
#include <linux/firmware.h>
-#include <linux/regmap.h>
-#include <linux/reset.h>
#include <linux/mfd/syscon.h>
#include <linux/phy/phy.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
#include <sound/hdmi-codec.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+
#include "cdn-dp-core.h"
#include "cdn-dp-reg.h"
#include "rockchip_drm_vop.h"
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index 48fef95cb3c6..1bf4efdf9b5a 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -15,10 +15,10 @@
#ifndef _CDN_DP_CORE_H
#define _CDN_DP_CORE_H
-#include <drm/drmP.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_panel.h>
#include <drm/drm_probe_helper.h>
+
#include "rockchip_drm_drv.h"
#define MAX_PHY 2
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index ef8486e5e2cd..bc073ec5c183 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -6,10 +6,6 @@
* Nickey Yang <nickey.yang@rock-chips.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_mipi_dsi.h>
-#include <drm/bridge/dw_mipi_dsi.h>
-#include <drm/drm_of.h>
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/math64.h>
@@ -18,8 +14,13 @@
#include <linux/of_device.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
+
#include <video/mipi_display.h>
+#include <drm/bridge/dw_mipi_dsi.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_of.h>
+
#include "rockchip_drm_drv.h"
#include "rockchip_drm_vop.h"
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index cdc304d4cd02..906891b03a38 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -10,11 +10,10 @@
#include <linux/phy/phy.h>
#include <linux/regmap.h>
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
+#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_edid.h>
+#include <drm/drm_of.h>
#include <drm/drm_probe_helper.h>
-#include <drm/bridge/dw_hdmi.h>
#include "rockchip_drm_drv.h"
#include "rockchip_drm_vop.h"
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index f8ca98d294d0..ed344a795b4d 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -15,10 +15,9 @@
#include <linux/mutex.h>
#include <linux/of_device.h>
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
+#include <drm/drm_of.h>
#include <drm/drm_probe_helper.h>
#include "rockchip_drm_drv.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 782979f1b55a..30c177eb3022 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -6,11 +6,6 @@
* based on exynos_drm_drv.c
*/
-#include <drm/drmP.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_gem_cma_helper.h>
-#include <drm/drm_of.h>
-#include <drm/drm_probe_helper.h>
#include <linux/dma-mapping.h>
#include <linux/dma-iommu.h>
#include <linux/pm_runtime.h>
@@ -21,6 +16,13 @@
#include <linux/console.h>
#include <linux/iommu.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
#include "rockchip_drm_drv.h"
#include "rockchip_drm_fb.h"
#include "rockchip_drm_fbdev.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 64ca87cf6d50..1907e894649c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -5,11 +5,12 @@
*/
#include <linux/kernel.h>
+
#include <drm/drm.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_damage_helper.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_probe_helper.h>
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index bb8ac18298f6..02be6c5ff857 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -5,8 +5,8 @@
*/
#include <drm/drm.h>
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_probe_helper.h>
#include "rockchip_drm_drv.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index ba9e77acbe16..291e89b4045f 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -4,14 +4,14 @@
* Author:Mark Yao <mark.yao@rock-chips.com>
*/
+#include <linux/dma-buf.h>
+#include <linux/iommu.h>
+
#include <drm/drm.h>
-#include <drm/drmP.h>
#include <drm/drm_gem.h>
+#include <drm/drm_prime.h>
#include <drm/drm_vma_manager.h>
-#include <linux/dma-buf.h>
-#include <linux/iommu.h>
-
#include "rockchip_drm_drv.h"
#include "rockchip_drm_gem.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
index b604747fe453..80636edbab23 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
@@ -4,7 +4,6 @@
* Author: Yakir Yang <ykk@rock-chips.com>
*/
-#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_probe_helper.h>
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 09a790c2f3a1..b0179849de96 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -4,33 +4,34 @@
* Author:Mark Yao <mark.yao@rock-chips.com>
*/
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/delay.h>
+#include <linux/iopoll.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/overflow.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/reset.h>
+
#include <drm/drm.h>
-#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_uapi.h>
#include <drm/drm_crtc.h>
#include <drm/drm_flip_work.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
#ifdef CONFIG_DRM_ANALOGIX_DP
#include <drm/bridge/analogix_dp.h>
#endif
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/iopoll.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/component.h>
-#include <linux/overflow.h>
-
-#include <linux/reset.h>
-#include <linux/delay.h>
-
#include "rockchip_drm_drv.h"
#include "rockchip_drm_gem.h"
#include "rockchip_drm_fb.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 830858a809e5..64aefa856896 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -6,21 +6,21 @@
* Sandy Huang <hjc@rock-chips.com>
*/
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_dp_helper.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_of.h>
-#include <drm/drm_probe_helper.h>
-
-#include <linux/component.h>
#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/mfd/syscon.h>
#include <linux/of_graph.h>
#include <linux/pinctrl/devinfo.h>
+#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/reset.h>
+#include <drm/drm_atomic_helper.h>
+
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
#include "rockchip_drm_drv.h"
#include "rockchip_drm_vop.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
index ce4d82d293e4..89e0bb0fe0ab 100644
--- a/drivers/gpu/drm/rockchip/rockchip_rgb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
@@ -5,16 +5,15 @@
* Sandy Huang <hjc@rock-chips.com>
*/
-#include <drm/drmP.h>
+#include <linux/component.h>
+#include <linux/of_graph.h>
+
#include <drm/drm_atomic_helper.h>
#include <drm/drm_dp_helper.h>
-#include <drm/drm_panel.h>
#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
#include <drm/drm_probe_helper.h>
-#include <linux/component.h>
-#include <linux/of_graph.h>
-
#include "rockchip_drm_drv.h"
#include "rockchip_drm_vop.h"
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 7b9c74750f6d..d1494be14471 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -4,10 +4,15 @@
* Author:Mark Yao <mark.yao@rock-chips.com>
*/
-#include <drm/drmP.h>
-
-#include <linux/kernel.h>
#include <linux/component.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_plane.h>
+#include <drm/drm_print.h>
#include "rockchip_drm_vop.h"
#include "rockchip_vop_reg.h"
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
[not found] <20190716064220.18157-1-sam@ravnborg.org>
` (3 preceding siblings ...)
2019-07-16 6:42 ` [PATCH v2 18/19] drm/rockchip: " Sam Ravnborg
@ 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
5 siblings, 2 replies; 11+ messages in thread
From: Sam Ravnborg @ 2019-07-16 6:42 UTC (permalink / raw)
To: dri-devel
Cc: Philipp Zabel, David Airlie, Matthias Brugger, linux-mediatek,
Daniel Vetter, CK Hu, 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ 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>
` (4 preceding siblings ...)
2019-07-16 6:42 ` [PATCH v2 19/19] drm/mediatek: " Sam Ravnborg
@ 2019-07-16 6:50 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
5 siblings, 1 reply; 11+ 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,
Robert Tarasov, Emil Lundmark, Jani Nikula, Sascha Hauer,
Maarten Lankhorst, Jyri Sarha, linux-mediatek, Matthias Brugger,
linux-amlogic, Sean Paul, Pengutronix Kernel Team,
linux-arm-kernel, Thomas Zimmermann, Sandy Huang,
Noralf Trønnes, Daniel Vetter, Alex Deucher,
Mikulas Patocka, Shawn Guo
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ 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: " Sam Ravnborg
@ 2019-07-16 7:44 ` CK Hu
2019-07-16 14:02 ` Alex Deucher
1 sibling, 0 replies; 11+ messages in thread
From: CK Hu @ 2019-07-16 7:44 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Philipp Zabel, David Airlie, dri-devel, linux-mediatek,
Daniel Vetter, 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"
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 05/19] drm/sun4i: drop use of drmP.h
2019-07-16 6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
@ 2019-07-16 8:28 ` Maxime Ripard
0 siblings, 0 replies; 11+ messages in thread
From: Maxime Ripard @ 2019-07-16 8:28 UTC (permalink / raw)
To: Sam Ravnborg
Cc: David Airlie, dri-devel, Chen-Yu Tsai, Daniel Vetter,
linux-arm-kernel, Emil Velikov
On Tue, Jul 16, 2019 at 08:42:06AM +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header file.
>
> While touching the list of include file, use the typical order of the
> blocks:
> \#include <linux/*>
>
> \#include <video/*>
>
> \#include <drm/*>
>
> \#include ""
>
> Within each block, sort the files.
> Include necessary files to fix build after the drmP.h removal.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Maxime Ripard <maxime.ripard@bootlin.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ 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: " Sam Ravnborg
2019-07-16 7:44 ` CK Hu
@ 2019-07-16 14:02 ` Alex Deucher
1 sibling, 0 replies; 11+ 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 01/19] drm/meson: drop use of drmP.h
2019-07-16 6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
@ 2019-07-16 14:03 ` Alex Deucher
0 siblings, 0 replies; 11+ messages in thread
From: Alex Deucher @ 2019-07-16 14:03 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Maxime Jourdan, Neil Armstrong, Kevin Hilman,
Maling list - DRI developers, linux-amlogic, Jerome Brunet,
linux-arm-kernel, Emil Velikov
On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Drop use of the deprecated drmP.h header.
> While doing so used the opportunity
> to clean up a little so includes are now
> sorted and removed unused include files.
> In a few cases added some forwards to allow header
> files to built in different include order.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Maxime Jourdan <mjourdan@baylibre.com>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Cc: linux-amlogic@lists.infradead.org
> Cc: linux-arm-kernel@lists.infradead.org
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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 +++
> include/linux/soc/amlogic/meson-canvas.h | 1 +
> 16 files changed, 77 insertions(+), 79 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
> index aa8ea107524e..3320a74e67fa 100644
> --- a/drivers/gpu/drm/meson/meson_crtc.c
> +++ b/drivers/gpu/drm/meson/meson_crtc.c
> @@ -9,23 +9,21 @@
> * Jasper St. Pierre <jstpierre@mecheye.net>
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/mutex.h>
> -#include <linux/platform_device.h>
> #include <linux/bitfield.h>
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic.h>
> +#include <linux/soc/amlogic/meson-canvas.h>
> +
> #include <drm/drm_atomic_helper.h>
> -#include <drm/drm_flip_work.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
> +#include <drm/drm_vblank.h>
>
> #include "meson_crtc.h"
> #include "meson_plane.h"
> +#include "meson_registers.h"
> #include "meson_venc.h"
> -#include "meson_vpp.h"
> #include "meson_viu.h"
> -#include "meson_registers.h"
> +#include "meson_vpp.h"
>
> #define MESON_G12A_VIU_OFFSET 0x5ec0
>
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index 37dca83d6eb1..42af49afdd75 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -8,35 +8,30 @@
> * Jasper St. Pierre <jstpierre@mecheye.net>
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/mutex.h>
> -#include <linux/platform_device.h>
> #include <linux/component.h>
> +#include <linux/module.h>
> #include <linux/of_graph.h>
> +#include <linux/platform_device.h>
> +#include <linux/soc/amlogic/meson-canvas.h>
>
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> -#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_drv.h>
> #include <drm/drm_fb_helper.h>
> -#include <drm/drm_flip_work.h>
> #include <drm/drm_gem_cma_helper.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> -#include <drm/drm_plane_helper.h>
> +#include <drm/drm_irq.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> #include <drm/drm_probe_helper.h>
> -#include <drm/drm_rect.h>
> +#include <drm/drm_vblank.h>
>
> +#include "meson_crtc.h"
> #include "meson_drv.h"
> -#include "meson_plane.h"
> #include "meson_overlay.h"
> -#include "meson_crtc.h"
> +#include "meson_plane.h"
> +#include "meson_registers.h"
> #include "meson_venc_cvbs.h"
> -
> -#include "meson_vpp.h"
> #include "meson_viu.h"
> -#include "meson_venc.h"
> -#include "meson_registers.h"
> +#include "meson_vpp.h"
>
> #define DRIVER_NAME "meson"
> #define DRIVER_DESC "Amlogic Meson DRM driver"
> diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
> index 7b6593f33dfe..c9aaec1a846e 100644
> --- a/drivers/gpu/drm/meson/meson_drv.h
> +++ b/drivers/gpu/drm/meson/meson_drv.h
> @@ -7,11 +7,14 @@
> #ifndef __MESON_DRV_H
> #define __MESON_DRV_H
>
> -#include <linux/platform_device.h>
> -#include <linux/regmap.h>
> +#include <linux/device.h>
> #include <linux/of.h>
> -#include <linux/soc/amlogic/meson-canvas.h>
> -#include <drm/drmP.h>
> +#include <linux/regmap.h>
> +
> +struct drm_crtc;
> +struct drm_device;
> +struct drm_plane;
> +struct meson_drm;
>
> struct meson_drm {
> struct device *dev;
> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> index df3f9ddd2234..9f0b08eaf003 100644
> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> @@ -5,29 +5,30 @@
> * Copyright (C) 2015 Amlogic, Inc. All rights reserved.
> */
>
> +#include <linux/clk.h>
> +#include <linux/component.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/component.h>
> #include <linux/of_device.h>
> #include <linux/of_graph.h>
> -#include <linux/reset.h>
> -#include <linux/clk.h>
> #include <linux/regulator/consumer.h>
> +#include <linux/reset.h>
>
> -#include <drm/drmP.h>
> +#include <drm/bridge/dw_hdmi.h>
> #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_device.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_probe_helper.h>
> -#include <drm/bridge/dw_hdmi.h>
> +#include <drm/drm_print.h>
>
> -#include <uapi/linux/media-bus-format.h>
> -#include <uapi/linux/videodev2.h>
> +#include <linux/media-bus-format.h>
> +#include <linux/videodev2.h>
>
> #include "meson_drv.h"
> -#include "meson_venc.h"
> -#include "meson_vclk.h"
> #include "meson_dw_hdmi.h"
> #include "meson_registers.h"
> +#include "meson_vclk.h"
> +#include "meson_venc.h"
>
> #define DRIVER_NAME "meson-dw-hdmi"
> #define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver"
> diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c
> index cc7c6ae3013d..5aa9dcb4b35e 100644
> --- a/drivers/gpu/drm/meson/meson_overlay.c
> +++ b/drivers/gpu/drm/meson/meson_overlay.c
> @@ -5,24 +5,21 @@
> * Copyright (C) 2015 Amlogic, Inc. All rights reserved.
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/mutex.h>
> #include <linux/bitfield.h>
> -#include <linux/platform_device.h>
> -#include <drm/drmP.h>
> +
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_fourcc.h>
> #include <drm/drm_plane_helper.h>
> #include <drm/drm_gem_cma_helper.h>
> #include <drm/drm_fb_cma_helper.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> -#include <drm/drm_rect.h>
>
> #include "meson_overlay.h"
> -#include "meson_vpp.h"
> -#include "meson_viu.h"
> #include "meson_registers.h"
> +#include "meson_viu.h"
> +#include "meson_vpp.h"
>
> /* VD1_IF0_GEN_REG */
> #define VD_URGENT_CHROMA BIT(28)
> diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
> index 7a7e88dadd0b..80b8d70c4d75 100644
> --- a/drivers/gpu/drm/meson/meson_plane.c
> +++ b/drivers/gpu/drm/meson/meson_plane.c
> @@ -9,24 +9,20 @@
> * Jasper St. Pierre <jstpierre@mecheye.net>
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/mutex.h>
> #include <linux/bitfield.h>
> -#include <linux/platform_device.h>
> -#include <drm/drmP.h>
> +
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> -#include <drm/drm_plane_helper.h>
> -#include <drm/drm_gem_cma_helper.h>
> +#include <drm/drm_device.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_rect.h>
> +#include <drm/drm_plane_helper.h>
>
> #include "meson_plane.h"
> -#include "meson_vpp.h"
> -#include "meson_viu.h"
> #include "meson_registers.h"
> +#include "meson_viu.h"
>
> /* OSD_SCI_WH_M1 */
> #define SCI_WH_M1_W(w) FIELD_PREP(GENMASK(28, 16), w)
> diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
> index 410e324d6f93..057453ce027c 100644
> --- a/drivers/gpu/drm/meson/meson_registers.h
> +++ b/drivers/gpu/drm/meson/meson_registers.h
> @@ -6,6 +6,8 @@
> #ifndef __MESON_REGISTERS_H
> #define __MESON_REGISTERS_H
>
> +#include <linux/io.h>
> +
> /* Shift all registers by 2 */
> #define _REG(reg) ((reg) << 2)
>
> diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
> index 26732f038d19..8abff51f937d 100644
> --- a/drivers/gpu/drm/meson/meson_vclk.c
> +++ b/drivers/gpu/drm/meson/meson_vclk.c
> @@ -5,9 +5,10 @@
> * Copyright (C) 2015 Amlogic, Inc. All rights reserved.
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <drm/drmP.h>
> +#include <linux/export.h>
> +
> +#include <drm/drm_print.h>
> +
> #include "meson_drv.h"
> #include "meson_vclk.h"
>
> diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h
> index ed993d20abda..b62125540aef 100644
> --- a/drivers/gpu/drm/meson/meson_vclk.h
> +++ b/drivers/gpu/drm/meson/meson_vclk.h
> @@ -9,6 +9,10 @@
> #ifndef __MESON_VCLK_H
> #define __MESON_VCLK_H
>
> +#include <drm/drm_modes.h>
> +
> +struct meson_drm;
> +
> enum {
> MESON_VCLK_TARGET_CVBS = 0,
> MESON_VCLK_TARGET_HDMI = 1,
> diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
> index 7b7a0d8d737c..3d4791798ae0 100644
> --- a/drivers/gpu/drm/meson/meson_venc.c
> +++ b/drivers/gpu/drm/meson/meson_venc.c
> @@ -5,14 +5,14 @@
> * Copyright (C) 2015 Amlogic, Inc. All rights reserved.
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <drm/drmP.h>
> +#include <linux/export.h>
> +
> +#include <drm/drm_modes.h>
> +
> #include "meson_drv.h"
> +#include "meson_registers.h"
> #include "meson_venc.h"
> #include "meson_vpp.h"
> -#include "meson_vclk.h"
> -#include "meson_registers.h"
>
> /**
> * DOC: Video Encoder
> diff --git a/drivers/gpu/drm/meson/meson_venc.h b/drivers/gpu/drm/meson/meson_venc.h
> index 985642a1678e..576768bdd08d 100644
> --- a/drivers/gpu/drm/meson/meson_venc.h
> +++ b/drivers/gpu/drm/meson/meson_venc.h
> @@ -14,6 +14,8 @@
> #ifndef __MESON_VENC_H
> #define __MESON_VENC_H
>
> +struct drm_display_mode;
> +
> enum {
> MESON_VENC_MODE_NONE = 0,
> MESON_VENC_MODE_CVBS_PAL,
> diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> index 6313a519f257..45a467f10b9b 100644
> --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
> +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> @@ -9,19 +9,18 @@
> * Jasper St. Pierre <jstpierre@mecheye.net>
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> +#include <linux/export.h>
> #include <linux/of_graph.h>
>
> -#include <drm/drmP.h>
> #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_device.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_probe_helper.h>
> +#include <drm/drm_print.h>
>
> -#include "meson_venc_cvbs.h"
> -#include "meson_venc.h"
> -#include "meson_vclk.h"
> #include "meson_registers.h"
> +#include "meson_vclk.h"
> +#include "meson_venc_cvbs.h"
>
> /* HHI VDAC Registers */
> #define HHI_VDAC_CNTL0 0x2F4 /* 0xbd offset in data sheet */
> diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
> index 4b2b3024d371..9f8a450d50d5 100644
> --- a/drivers/gpu/drm/meson/meson_viu.c
> +++ b/drivers/gpu/drm/meson/meson_viu.c
> @@ -6,13 +6,10 @@
> * Copyright (C) 2014 Endless Mobile
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <drm/drmP.h>
> +#include <linux/export.h>
> +
> #include "meson_drv.h"
> #include "meson_viu.h"
> -#include "meson_vpp.h"
> -#include "meson_venc.h"
> #include "meson_registers.h"
>
> /**
> diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
> index bfee30fa6e34..cbe6cf46e541 100644
> --- a/drivers/gpu/drm/meson/meson_vpp.c
> +++ b/drivers/gpu/drm/meson/meson_vpp.c
> @@ -6,12 +6,11 @@
> * Copyright (C) 2014 Endless Mobile
> */
>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <drm/drmP.h>
> +#include <linux/export.h>
> +
> #include "meson_drv.h"
> -#include "meson_vpp.h"
> #include "meson_registers.h"
> +#include "meson_vpp.h"
>
> /**
> * DOC: Video Post Processing
> diff --git a/drivers/gpu/drm/meson/meson_vpp.h b/drivers/gpu/drm/meson/meson_vpp.h
> index 9fc82db8a12d..afc9553ed8d3 100644
> --- a/drivers/gpu/drm/meson/meson_vpp.h
> +++ b/drivers/gpu/drm/meson/meson_vpp.h
> @@ -9,6 +9,9 @@
> #ifndef __MESON_VPP_H
> #define __MESON_VPP_H
>
> +struct drm_rect;
> +struct meson_drm;
> +
> /* Mux VIU/VPP to ENCI */
> #define MESON_VIU_VPP_MUX_ENCI 0x5
> /* Mux VIU/VPP to ENCP */
> diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h
> index b4dde2fbeb3f..0cb2a6050d1f 100644
> --- a/include/linux/soc/amlogic/meson-canvas.h
> +++ b/include/linux/soc/amlogic/meson-canvas.h
> @@ -20,6 +20,7 @@
> #define MESON_CANVAS_ENDIAN_SWAP64 0x7
> #define MESON_CANVAS_ENDIAN_SWAP128 0xf
>
> +struct device;
> struct meson_canvas;
>
> /**
> --
> 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
^ permalink raw reply [flat|nested] 11+ 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; 11+ 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, Sean Paul, linux-arm-kernel, Thomas Zimmermann,
Pengutronix Kernel Team, Alex Deucher, Mikulas Patocka,
Shawn Guo
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-07-17 10:59 UTC | newest]
Thread overview: 11+ 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 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
2019-07-16 14:03 ` 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 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 ` [PATCH v2 19/19] drm/mediatek: " 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).