* [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:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
1 sibling, 1 reply; 4+ 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-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
[not found] <20190716064220.18157-1-sam@ravnborg.org>
2019-07-16 6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
@ 2019-07-16 6:50 ` Sam Ravnborg
2019-07-17 10:59 ` Sam Ravnborg
1 sibling, 1 reply; 4+ 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-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 4+ 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; 4+ 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-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 4+ 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; 4+ 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-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-17 10:59 UTC | newest]
Thread overview: 4+ 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: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).