All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
@ 2019-07-16  6:42 Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
                   ` (18 more replies)
  0 siblings, 19 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel

This patch set removes a far share of the remaining uses of drmP.h.
Common for all patches are that the respective files are maintained
in drm-misc.
All patches are independent.

Patches have all been build tested with various configs and various
architectures.
There are likely introduced a few build issues that randconfig
build will reveal, but for all configs I have used the build was OK.

This patchset does not conclude the quest to kill all uses
of drmP.h, but it is a major step towards the goal.

Please review/ack.
I plan to apply the patches to drm-misc, but feel free
to do it yourself.

There will be conflicts with the ongoing work on ttm, gem etc.
But let's deal with the conflicts when they hit us - it
is simple conflicts in the list of include files.

v2:
- Removed merged patches
- Added ack from Emil Velikov to the full series
- Rebased on top of drm-misc-next
- Hand-edited the list of Cc: as get_maintainer.pl in some
  cases looks up too much people, due to cross kernel commits

        Sam

Sam Ravnborg (19):
      drm/meson: drop use of drmP.h
      drm/v3d: drop use of drmP.h
      drm/pl111: drop use of drmP.h
      drm/zte: drop use of drmP.h
      drm/sun4i: drop use of drmP.h
      drm/vc4: drop use of drmP.h
      drm/r128: drop use of drmP.h
      drm/udl: drop use of drmP.h
      drm/omapdrm: drop use of drmP.h
      drm/selftests: drop use of drmP.h
      drm/tdfx: drop use of drmP.h
      drm/vgem: drop use of drmP.h
      drm/i810: drop use of drmP.h
      drm/tilcdc: drop use of drmP.h
      drm/i2c/ch7006: drop use of drmP.h
      drm/i2c/sil164: drop use of drmP.h
      drm/imx: drop use of drmP.h
      drm/rockchip: drop use of drmP.h
      drm/mediatek: drop use of drmP.h

 drivers/gpu/drm/i2c/ch7006_priv.h                |  1 -
 drivers/gpu/drm/i2c/sil164_drv.c                 |  3 ++-
 drivers/gpu/drm/i810/i810_dma.c                  | 17 +++++++++----
 drivers/gpu/drm/i810/i810_drv.c                  |  8 +++---
 drivers/gpu/drm/i810/i810_drv.h                  |  2 ++
 drivers/gpu/drm/imx/dw_hdmi-imx.c                | 14 ++++++-----
 drivers/gpu/drm/imx/imx-drm-core.c               |  8 ++++--
 drivers/gpu/drm/imx/imx-ldb.c                    | 22 +++++++++--------
 drivers/gpu/drm/imx/imx-tve.c                    | 10 +++++---
 drivers/gpu/drm/imx/ipuv3-crtc.c                 |  8 ++++--
 drivers/gpu/drm/imx/ipuv3-plane.c                |  5 ++--
 drivers/gpu/drm/imx/parallel-display.c           |  8 +++---
 drivers/gpu/drm/mediatek/mtk_disp_color.c        |  2 +-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c          |  2 +-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c         |  2 +-
 drivers/gpu/drm/mediatek/mtk_dpi.c               | 18 ++++++++------
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c          | 10 +++++---
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c      |  2 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c           | 16 +++++++-----
 drivers/gpu/drm/mediatek/mtk_drm_fb.c            |  7 +++---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c           |  6 +++--
 drivers/gpu/drm/mediatek/mtk_drm_plane.c         |  2 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c               | 14 ++++++-----
 drivers/gpu/drm/mediatek/mtk_hdmi.c              | 14 +++++++----
 drivers/gpu/drm/meson/meson_crtc.c               | 16 ++++++------
 drivers/gpu/drm/meson/meson_drv.c                | 27 +++++++++------------
 drivers/gpu/drm/meson/meson_drv.h                | 11 ++++++---
 drivers/gpu/drm/meson/meson_dw_hdmi.c            | 19 ++++++++-------
 drivers/gpu/drm/meson/meson_overlay.c            | 13 ++++------
 drivers/gpu/drm/meson/meson_plane.c              | 16 +++++-------
 drivers/gpu/drm/meson/meson_registers.h          |  2 ++
 drivers/gpu/drm/meson/meson_vclk.c               |  7 +++---
 drivers/gpu/drm/meson/meson_vclk.h               |  4 +++
 drivers/gpu/drm/meson/meson_venc.c               | 10 ++++----
 drivers/gpu/drm/meson/meson_venc.h               |  2 ++
 drivers/gpu/drm/meson/meson_venc_cvbs.c          | 11 ++++-----
 drivers/gpu/drm/meson/meson_viu.c                |  7 ++----
 drivers/gpu/drm/meson/meson_vpp.c                |  7 +++---
 drivers/gpu/drm/meson/meson_vpp.h                |  3 +++
 drivers/gpu/drm/omapdrm/omap_crtc.c              |  4 ++-
 drivers/gpu/drm/omapdrm/omap_debugfs.c           |  2 ++
 drivers/gpu/drm/omapdrm/omap_drv.c               | 10 ++++++--
 drivers/gpu/drm/omapdrm/omap_drv.h               |  5 ++--
 drivers/gpu/drm/omapdrm/omap_fb.c                |  4 +--
 drivers/gpu/drm/omapdrm/omap_fbdev.c             |  2 ++
 drivers/gpu/drm/omapdrm/omap_gem.c               |  2 ++
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c        |  3 +++
 drivers/gpu/drm/omapdrm/omap_irq.c               |  2 ++
 drivers/gpu/drm/pl111/pl111_debugfs.c            |  4 ++-
 drivers/gpu/drm/pl111/pl111_display.c            |  6 +++--
 drivers/gpu/drm/pl111/pl111_drm.h                | 11 +++++----
 drivers/gpu/drm/pl111/pl111_drv.c                |  9 ++++---
 drivers/gpu/drm/pl111/pl111_nomadik.h            |  3 ++-
 drivers/gpu/drm/pl111/pl111_versatile.c          |  9 ++++---
 drivers/gpu/drm/pl111/pl111_versatile.h          |  3 +++
 drivers/gpu/drm/r128/r128_ioc32.c                |  3 ++-
 drivers/gpu/drm/r128/r128_irq.c                  |  5 +++-
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c  | 10 +++-----
 drivers/gpu/drm/rockchip/cdn-dp-core.c           | 17 ++++++-------
 drivers/gpu/drm/rockchip/cdn-dp-core.h           |  2 +-
 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c  |  9 ++++---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c      |  5 ++--
 drivers/gpu/drm/rockchip/inno_hdmi.c             |  3 +--
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c      | 12 +++++----
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c       |  3 ++-
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c    |  2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c      |  8 +++---
 drivers/gpu/drm/rockchip/rockchip_drm_psr.c      |  1 -
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c      | 31 ++++++++++++------------
 drivers/gpu/drm/rockchip/rockchip_lvds.c         | 16 ++++++------
 drivers/gpu/drm/rockchip/rockchip_rgb.c          |  9 +++----
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c      | 11 ++++++---
 drivers/gpu/drm/selftests/test-drm_framebuffer.c |  7 +++++-
 drivers/gpu/drm/sun4i/sun4i_backend.c            | 16 ++++++------
 drivers/gpu/drm/sun4i/sun4i_crtc.c               | 13 +++++-----
 drivers/gpu/drm/sun4i/sun4i_drv.c                |  5 +++-
 drivers/gpu/drm/sun4i/sun4i_framebuffer.c        |  1 -
 drivers/gpu/drm/sun4i/sun4i_frontend.c           | 10 +++++---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c           | 17 +++++++------
 drivers/gpu/drm/sun4i/sun4i_layer.c              |  3 +--
 drivers/gpu/drm/sun4i/sun4i_lvds.c               |  2 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                |  2 +-
 drivers/gpu/drm/sun4i/sun4i_tcon.c               | 20 ++++++++-------
 drivers/gpu/drm/sun4i/sun4i_tv.c                 |  4 ++-
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c           |  9 ++++---
 drivers/gpu/drm/sun4i/sun8i_csc.c                |  2 +-
 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c            |  3 +--
 drivers/gpu/drm/sun4i/sun8i_mixer.c              | 14 +++++------
 drivers/gpu/drm/sun4i/sun8i_tcon_top.c           |  6 ++---
 drivers/gpu/drm/sun4i/sun8i_ui_layer.c           |  2 +-
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c           |  1 -
 drivers/gpu/drm/tdfx/tdfx_drv.c                  | 11 ++++++---
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c             | 18 ++++++++------
 drivers/gpu/drm/tilcdc/tilcdc_drv.c              | 19 ++++++++++++---
 drivers/gpu/drm/tilcdc/tilcdc_drv.h              | 31 +++++++++++++-----------
 drivers/gpu/drm/tilcdc/tilcdc_external.c         |  1 +
 drivers/gpu/drm/tilcdc/tilcdc_panel.c            | 11 ++++++---
 drivers/gpu/drm/tilcdc/tilcdc_plane.c            |  4 +--
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c           |  8 +++---
 drivers/gpu/drm/udl/udl_connector.c              |  4 +--
 drivers/gpu/drm/udl/udl_connector.h              |  2 ++
 drivers/gpu/drm/udl/udl_dmabuf.c                 |  6 +++--
 drivers/gpu/drm/udl/udl_drv.c                    |  7 +++++-
 drivers/gpu/drm/udl/udl_drv.h                    |  8 +++++-
 drivers/gpu/drm/udl/udl_encoder.c                |  6 ++---
 drivers/gpu/drm/udl/udl_fb.c                     | 15 ++++++------
 drivers/gpu/drm/udl/udl_gem.c                    |  9 ++++---
 drivers/gpu/drm/udl/udl_main.c                   |  6 +++--
 drivers/gpu/drm/udl/udl_modeset.c                |  6 ++---
 drivers/gpu/drm/udl/udl_transfer.c               |  4 ---
 drivers/gpu/drm/v3d/v3d_debugfs.c                |  3 ++-
 drivers/gpu/drm/v3d/v3d_drv.c                    |  5 +++-
 drivers/gpu/drm/v3d/v3d_drv.h                    | 13 ++++++++--
 drivers/gpu/drm/v3d/v3d_gem.c                    | 12 +++++----
 drivers/gpu/drm/v3d/v3d_irq.c                    |  2 ++
 drivers/gpu/drm/vc4/vc4_crtc.c                   | 11 ++++++---
 drivers/gpu/drm/vc4/vc4_debugfs.c                |  1 -
 drivers/gpu/drm/vc4/vc4_drv.c                    |  7 +++++-
 drivers/gpu/drm/vc4/vc4_drv.h                    | 17 +++++++++----
 drivers/gpu/drm/vc4/vc4_dsi.c                    | 17 +++++++------
 drivers/gpu/drm/vc4/vc4_gem.c                    |  2 ++
 drivers/gpu/drm/vc4/vc4_hvs.c                    |  5 +++-
 drivers/gpu/drm/vc4/vc4_kms.c                    |  4 ++-
 drivers/gpu/drm/vc4/vc4_plane.c                  |  6 +++--
 drivers/gpu/drm/vc4/vc4_txp.c                    | 14 ++++++-----
 drivers/gpu/drm/vc4/vc4_v3d.c                    |  4 +++
 drivers/gpu/drm/vgem/vgem_drv.c                  | 11 +++++++--
 drivers/gpu/drm/vgem/vgem_drv.h                  |  1 -
 drivers/gpu/drm/vgem/vgem_fence.c                |  2 ++
 drivers/gpu/drm/zte/zx_drm_drv.c                 |  3 ++-
 drivers/gpu/drm/zte/zx_hdmi.c                    |  2 +-
 drivers/gpu/drm/zte/zx_plane.c                   |  2 +-
 drivers/gpu/drm/zte/zx_tvenc.c                   |  4 ++-
 drivers/gpu/drm/zte/zx_vga.c                     |  4 ++-
 drivers/gpu/drm/zte/zx_vou.c                     |  5 +++-
 include/linux/soc/amlogic/meson-canvas.h         |  1 +
 136 files changed, 626 insertions(+), 427 deletions(-)


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* [PATCH v2 01/19] drm/meson: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
@ 2019-07-16  6:42   ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
                     ` (16 subsequent siblings)
  18 siblings, 0 replies; 45+ 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] 45+ messages in thread
* [PATCH v2 01/19] drm/meson: drop use of drmP.h
@ 2019-07-16  6:42   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 01/19] drm/meson: drop use of drmP.h
@ 2019-07-16  6:42   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* [PATCH v2 02/19] drm/v3d: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16 14:06   ` Alex Deucher
  2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
                   ` (16 subsequent siblings)
  18 siblings, 1 reply; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Emil Velikov

Drop use of the deprecated drmP.h header file.
Made v3d_drv.h self-contained with only sufficient
include files.
Fixed fallout in remaining files.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 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 ++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c
index 78a78938e81f..9e953ce64ef7 100644
--- a/drivers/gpu/drm/v3d/v3d_debugfs.c
+++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
@@ -6,7 +6,8 @@
 #include <linux/debugfs.h>
 #include <linux/pm_runtime.h>
 #include <linux/seq_file.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_debugfs.h>
 
 #include "v3d_drv.h"
 #include "v3d_regs.h"
diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
index a1604705faee..3506ae2723ae 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.c
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
@@ -14,16 +14,19 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
+
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <uapi/drm/v3d_drm.h>
 
-#include "uapi/drm/v3d_drm.h"
 #include "v3d_drv.h"
 #include "v3d_regs.h"
 
diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
index 9aad9da1eb11..9a35c555ec52 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -1,14 +1,23 @@
 // SPDX-License-Identifier: GPL-2.0+
 /* Copyright (C) 2015-2018 Broadcom */
 
-#include <linux/mm_types.h>
-#include <drm/drmP.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/spinlock_types.h>
+#include <linux/workqueue.h>
+
 #include <drm/drm_encoder.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_gem_shmem_helper.h>
 #include <drm/gpu_scheduler.h>
+
 #include "uapi/drm/v3d_drm.h"
 
+struct clk;
+struct device;
+struct platform_device;
+struct reset_control;
+
 #define GMP_GRANULARITY (128 * 1024)
 
 /* Enum for each of the V3D queues. */
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index 27e0f87075d9..79744137d89f 100644
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -1,17 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0+
 /* Copyright (C) 2014-2018 Broadcom */
 
-#include <drm/drmP.h>
-#include <drm/drm_syncobj.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
-#include <linux/device.h>
-#include <linux/io.h>
 #include <linux/sched/signal.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_syncobj.h>
+#include <uapi/drm/v3d_drm.h>
 
-#include "uapi/drm/v3d_drm.h"
 #include "v3d_drv.h"
 #include "v3d_regs.h"
 #include "v3d_trace.h"
diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
index 268d8a889ac5..662e67279a7b 100644
--- a/drivers/gpu/drm/v3d/v3d_irq.c
+++ b/drivers/gpu/drm/v3d/v3d_irq.c
@@ -13,6 +13,8 @@
  * current job can make progress.
  */
 
+#include <linux/platform_device.h>
+
 #include "v3d_drv.h"
 #include "v3d_regs.h"
 #include "v3d_trace.h"
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 03/19] drm/pl111: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16 14:06   ` Alex Deucher
  2019-07-16  6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
                   ` (15 subsequent siblings)
  18 siblings, 1 reply; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Emil Velikov

Drop use of the deprecated drmP.h header.
Sort includes in blocks while touching the files.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 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 +++
 7 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/pl111/pl111_debugfs.c b/drivers/gpu/drm/pl111/pl111_debugfs.c
index 7ddc7e3b9e7d..7accfd6f7bde 100644
--- a/drivers/gpu/drm/pl111/pl111_debugfs.c
+++ b/drivers/gpu/drm/pl111/pl111_debugfs.c
@@ -8,8 +8,10 @@
 
 #include <linux/amba/clcd-regs.h>
 #include <linux/seq_file.h>
+
 #include <drm/drm_debugfs.h>
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
+
 #include "pl111_drm.h"
 
 #define REGDEF(reg) { reg, #reg }
diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
index 15d2755fdba4..a246195dc606 100644
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -11,14 +11,16 @@
 
 #include <linux/amba/clcd-regs.h>
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/version.h>
 #include <linux/dma-buf.h>
 #include <linux/of_graph.h>
 
-#include <drm/drmP.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_fb_cma_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "pl111_drm.h"
 
diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
index b2c5e9f34051..77d2da9a8a7c 100644
--- a/drivers/gpu/drm/pl111/pl111_drm.h
+++ b/drivers/gpu/drm/pl111/pl111_drm.h
@@ -13,14 +13,15 @@
 #ifndef _PL111_DRM_H_
 #define _PL111_DRM_H_
 
-#include <drm/drm_gem.h>
-#include <drm/drm_simple_kms_helper.h>
+#include <linux/clk-provider.h>
+#include <linux/interrupt.h>
+
+#include <drm/drm_bridge.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_encoder.h>
+#include <drm/drm_gem.h>
 #include <drm/drm_panel.h>
-#include <drm/drm_bridge.h>
-#include <linux/clk-provider.h>
-#include <linux/interrupt.h>
+#include <drm/drm_simple_kms_helper.h>
 
 #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)
 
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index 90fa99a7dfa9..276b53473a84 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -48,18 +48,18 @@
 
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd-regs.h>
-#include <linux/version.h>
-#include <linux/shmem_fs.h>
 #include <linux/dma-buf.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/shmem_fs.h>
+#include <linux/slab.h>
+#include <linux/version.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.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>
@@ -67,6 +67,7 @@
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "pl111_drm.h"
 #include "pl111_versatile.h"
diff --git a/drivers/gpu/drm/pl111/pl111_nomadik.h b/drivers/gpu/drm/pl111/pl111_nomadik.h
index 19d663d46353..47ccf5c839fc 100644
--- a/drivers/gpu/drm/pl111/pl111_nomadik.h
+++ b/drivers/gpu/drm/pl111/pl111_nomadik.h
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0+
-#include <linux/device.h>
 
 #ifndef PL111_NOMADIK_H
 #define PL111_NOMADIK_H
 #endif
 
+struct device;
+
 #ifdef CONFIG_ARCH_NOMADIK
 
 void pl111_nomadik_init(struct device *dev);
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
index 38f4ee05285e..09aeaffb7660 100644
--- a/drivers/gpu/drm/pl111/pl111_versatile.c
+++ b/drivers/gpu/drm/pl111/pl111_versatile.c
@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
+
 #include <linux/amba/clcd-regs.h>
+#include <linux/bitops.h>
 #include <linux/device.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/regmap.h>
-#include <linux/mfd/syscon.h>
-#include <linux/bitops.h>
-#include <linux/module.h>
-#include <drm/drmP.h>
+
 #include "pl111_versatile.h"
 #include "pl111_vexpress.h"
 #include "pl111_drm.h"
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.h b/drivers/gpu/drm/pl111/pl111_versatile.h
index 41aa6d969dc6..143877010042 100644
--- a/drivers/gpu/drm/pl111/pl111_versatile.h
+++ b/drivers/gpu/drm/pl111/pl111_versatile.h
@@ -4,6 +4,9 @@
 #ifndef PL111_VERSATILE_H
 #define PL111_VERSATILE_H
 
+struct device;
+struct pl111_drm_dev_private;
+
 int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv);
 
 #endif
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 05/19] drm/sun4i: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (2 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  8:28     ` Maxime Ripard
  2019-07-16  6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
                   ` (14 subsequent siblings)
  18 siblings, 1 reply; 45+ 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] 45+ messages in thread
* [PATCH v2 07/19] drm/r128: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (3 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16 14:01   ` Alex Deucher
  2019-07-16  6:42 ` [PATCH v2 09/19] drm/omapdrm: " Sam Ravnborg
                   ` (13 subsequent siblings)
  18 siblings, 1 reply; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Emil Velikov

Replace use of the deprecated drmP.h header file
with relevant includes.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 drivers/gpu/drm/r128/r128_ioc32.c | 3 ++-
 drivers/gpu/drm/r128/r128_irq.c   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
index 6589f9e0310e..6ac71755c22d 100644
--- a/drivers/gpu/drm/r128/r128_ioc32.c
+++ b/drivers/gpu/drm/r128/r128_ioc32.c
@@ -29,10 +29,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+
 #include <linux/compat.h>
 
-#include <drm/drmP.h>
 #include <drm/r128_drm.h>
+
 #include "r128_drv.h"
 
 typedef struct drm_r128_init32 {
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index 9730f4918944..d84e9c96e20a 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
@@ -30,8 +30,11 @@
  *    Eric Anholt <anholt@FreeBSD.org>
  */
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
+#include <drm/drm_print.h>
+#include <drm/drm_vblank.h>
 #include <drm/r128_drm.h>
+
 #include "r128_drv.h"
 
 u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 09/19] drm/omapdrm: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (4 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
                   ` (12 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Tomi Valkeinen, Sam Ravnborg, Emil Velikov

Drop use of the deprecated header drmP.h.
Rearranged list of include files to match rest of
DRM too.
The drmP.h file was deleted from the header file, and the necessary
includes was added to the .c files to fix build.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 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 ++
 9 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index d61215494617..a8f09829fcab 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -15,12 +15,14 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/math64.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mode.h>
 #include <drm/drm_plane_helper.h>
-#include <linux/math64.h>
+#include <drm/drm_vblank.h>
 
 #include "omap_drv.h"
 
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c
index 91cf043f2b6b..f2a68ef02b4e 100644
--- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
+++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -18,6 +18,8 @@
 #include <linux/seq_file.h>
 
 #include <drm/drm_crtc.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_file.h>
 #include <drm/drm_fb_helper.h>
 
 #include "omap_drv.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 7bd2da5eb1ce..05002b157745 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -15,15 +15,21 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/of.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include <linux/sort.h>
 #include <linux/sys_soc.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_probe_helper.h>
+#include <drm/drm_file.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_prime.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "omap_dmm_tiler.h"
 #include "omap_drv.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 896aa12f09b2..70654d9a0155 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -22,12 +22,11 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
-#include <drm/drmP.h>
+#include "dss/omapdss.h"
+
 #include <drm/drm_gem.h>
 #include <drm/omap_drm.h>
 
-#include "dss/omapdss.h"
-
 #include "omap_connector.h"
 #include "omap_crtc.h"
 #include "omap_encoder.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 06d5c5081e41..199ae8bf2769 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -15,10 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/seq_file.h>
+#include <linux/dma-mapping.h>
 
-#include <drm/drm_crtc.h>
 #include <drm/drm_modeset_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 
 #include "omap_dmm_tiler.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 0dad42e819ba..fbb3fe2dff97 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -18,6 +18,8 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_util.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_file.h>
+#include <drm/drm_fourcc.h>
 
 #include "omap_drv.h"
 
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 8dcaf9f4aa75..efe187df68f6 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -15,11 +15,13 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/seq_file.h>
 #include <linux/shmem_fs.h>
 #include <linux/spinlock.h>
 #include <linux/pfn_t.h>
 
+#include <drm/drm_prime.h>
 #include <drm/drm_vma_manager.h>
 
 #include "omap_drv.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index 7e7ad275e3cf..d9ab8052dd25 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -16,6 +16,9 @@
  */
 
 #include <linux/dma-buf.h>
+#include <linux/highmem.h>
+
+#include <drm/drm_prime.h>
 
 #include "omap_drv.h"
 
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
index 01dda84ca2ee..1f8588503db9 100644
--- a/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -15,6 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_vblank.h>
+
 #include "omap_drv.h"
 
 struct omap_irq_wait {
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 10/19] drm/selftests: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (5 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 09/19] drm/omapdrm: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16 14:02   ` Alex Deucher
  2019-07-16  6:42 ` [PATCH v2 11/19] drm/tdfx: " Sam Ravnborg
                   ` (11 subsequent siblings)
  18 siblings, 1 reply; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel
  Cc: David Airlie, Alexandru-Cosmin Gheorghe, Sam Ravnborg, Emil Velikov

Drop the single user of drmP.h - replace it with relevant includes.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Alexandru-Cosmin Gheorghe <Alexandru-Cosmin.Gheorghe@arm.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
index a04d02dacce2..74d5561a862b 100644
--- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c
+++ b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
@@ -3,7 +3,12 @@
  * Test cases for the drm_framebuffer functions
  */
 
-#include <drm/drmP.h>
+#include <linux/kernel.h>
+
+#include <drm/drm_device.h>
+#include <drm/drm_mode.h>
+#include <drm/drm_fourcc.h>
+
 #include "../drm_crtc_internal.h"
 
 #include "test-drm_modeset_common.h"
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 11/19] drm/tdfx: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (6 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 13/19] drm/i810: " Sam Ravnborg
                   ` (10 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Emil Velikov

Replace drmP.h include with necessary include files.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index 3a1476818c65..c243af156ee7 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -32,11 +32,14 @@
 
 #include <linux/module.h>
 
-#include <drm/drmP.h>
-#include "tdfx_drv.h"
-
-#include <drm/drm_pciids.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_legacy.h>
+#include <drm/drm_pci.h>
+#include <drm/drm_pciids.h>
+
+#include "tdfx_drv.h"
 
 static struct pci_device_id pciidlist[] = {
 	tdfx_PCI_IDS
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 13/19] drm/i810: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (7 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 11/19] drm/tdfx: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
                   ` (9 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Dan Carpenter, Emil Velikov

Drop use of the deprecated drmP.h header.
Replace with necessary includes.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/i810/i810_dma.c | 17 ++++++++++++-----
 drivers/gpu/drm/i810/i810_drv.c |  8 +++++---
 drivers/gpu/drm/i810/i810_drv.h |  2 ++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 3b378936f575..2a77823b8e9a 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -30,13 +30,20 @@
  *
  */
 
-#include <drm/drmP.h>
+#include <linux/delay.h>
+#include <linux/mman.h>
+
+#include <drm/drm_agpsupport.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_pci.h>
+#include <drm/drm_print.h>
 #include <drm/i810_drm.h>
+
 #include "i810_drv.h"
-#include <linux/interrupt.h>	/* For task queue support */
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
 
 #define I810_BUF_FREE		2
 #define I810_BUF_CLIENT		1
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index c69d5c487f51..5dd26a06ee0e 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -30,13 +30,15 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
+#include "i810_drv.h"
 #include <linux/module.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_pci.h>
+#include <drm/drm_pciids.h>
 #include <drm/i810_drm.h>
-#include "i810_drv.h"
 
-#include <drm/drm_pciids.h>
 
 static struct pci_device_id pciidlist[] = {
 	i810_PCI_IDS
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index c73d2f2da57b..9df3981ffc66 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -32,7 +32,9 @@
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_
 
+#include <drm/drm_ioctl.h>
 #include <drm/drm_legacy.h>
+#include <drm/i810_drm.h>
 
 /* General customization:
  */
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 14/19] drm/tilcdc: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (8 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 13/19] drm/i810: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-30  6:03   ` Jyri Sarha
  2019-07-16  6:42 ` [PATCH v2 15/19] drm/i2c/ch7006: " Sam Ravnborg
                   ` (8 subsequent siblings)
  18 siblings, 1 reply; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel
  Cc: David Airlie, Jyri Sarha, Tomi Valkeinen, Sam Ravnborg, Emil Velikov

Dropped drmP.h and all other header files not used by tilcdc_drv.h.
Added the minimal includes and forwards to make the header file
self-contained.

Then dropped the remaining uses of drmP.h and fixed all fall-out.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 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 +++---
 7 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 1067e702c22c..8c2025780372 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -15,16 +15,20 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/of_graph.h>
+#include <linux/pm_runtime.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
-#include <drm/drm_flip_work.h>
-#include <drm/drm_plane_helper.h>
-#include <linux/workqueue.h>
-#include <linux/completion.h>
-#include <linux/dma-mapping.h>
-#include <linux/of_graph.h>
-#include <linux/math64.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/drm_print.h>
+#include <drm/drm_vblank.h>
 
 #include "tilcdc_drv.h"
 #include "tilcdc_regs.h"
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index b6b71e86e238..8e228c75b68e 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -18,19 +18,30 @@
 /* LCDC DRM driver, based on da8xx-fb */
 
 #include <linux/component.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
-#include <linux/suspend.h>
-#include <drm/drm_atomic.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_mm.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
 
 #include "tilcdc_drv.h"
+#include "tilcdc_external.h"
+#include "tilcdc_panel.h"
 #include "tilcdc_regs.h"
 #include "tilcdc_tfp410.h"
-#include "tilcdc_panel.h"
-#include "tilcdc_external.h"
 
 static LIST_HEAD(module_list);
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
index d86397da12a9..50c208c48be0 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
@@ -18,21 +18,24 @@
 #ifndef __TILCDC_DRV_H__
 #define __TILCDC_DRV_H__
 
-#include <linux/clk.h>
 #include <linux/cpufreq.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/pm.h>
-#include <linux/pm_runtime.h>
-#include <linux/slab.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/list.h>
-
-#include <drm/drmP.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_fb_cma_helper.h>
-#include <drm/drm_gem_cma_helper.h>
+#include <linux/irqreturn.h>
+
+#include <drm/drm_print.h>
+
+struct clk;
+struct workqueue_struct;
+
+struct drm_connector;
+struct drm_connector_helper_funcs;
+struct drm_crtc;
+struct drm_device;
+struct drm_display_mode;
+struct drm_encoder;
+struct drm_framebuffer;
+struct drm_minor;
+struct drm_pending_vblank_event;
+struct drm_plane;
 
 /* Defaulting to pixel clock defined on AM335x */
 #define TILCDC_DEFAULT_MAX_PIXELCLOCK  126000
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c
index e9969cd36610..0f3419a19d71 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_external.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c
@@ -10,6 +10,7 @@
 
 #include <linux/component.h>
 #include <linux/of_graph.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_of.h>
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 5d532a596e1e..e1c39712b67a 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -15,14 +15,17 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/backlight.h>
 #include <linux/gpio/consumer.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+
 #include <video/display_timing.h>
 #include <video/of_display_timing.h>
 #include <video/videomode.h>
-#include <drm/drm_atomic_helper.h>
+
+#include <drm/drm_atomic_state_helper.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_modeset_helper_vtables.h>
 #include <drm/drm_probe_helper.h>
 
 #include "tilcdc_drv.h"
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
index 7667b038ae7f..347ca8656aef 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
@@ -15,12 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <drm/drmP.h>
-
 #include <drm/drm_atomic.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_atomic_helper.h>
-#include <uapi/drm/drm_fourcc.h>
+#include <drm/drm_fourcc.h>
 
 #include "tilcdc_drv.h"
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index fe59fbfdde69..da642c725cd6 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -15,12 +15,14 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/i2c.h>
 #include <linux/gpio.h>
+#include <linux/mod_devicetable.h>
 #include <linux/of_gpio.h>
-#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_encoder.h>
+#include <drm/drm_modeset_helper_vtables.h>
 #include <drm/drm_probe_helper.h>
 
 #include "tilcdc_drv.h"
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 15/19] drm/i2c/ch7006: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (9 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 17/19] drm/imx: " Sam Ravnborg
                   ` (7 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel; +Cc: David Airlie, Sam Ravnborg, Emil Velikov

Drop using the deprecated drmP.h header file.
Fix fallout.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 drivers/gpu/drm/i2c/ch7006_priv.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
index b6e091935977..986b04599906 100644
--- a/drivers/gpu/drm/i2c/ch7006_priv.h
+++ b/drivers/gpu/drm/i2c/ch7006_priv.h
@@ -27,7 +27,6 @@
 #ifndef __DRM_I2C_CH7006_PRIV_H__
 #define __DRM_I2C_CH7006_PRIV_H__
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder_slave.h>
 #include <drm/drm_probe_helper.h>
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 17/19] drm/imx: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (10 preceding siblings ...)
  2019-07-16  6:42 ` [PATCH v2 15/19] drm/i2c/ch7006: " Sam Ravnborg
@ 2019-07-16  6:42 ` Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
                   ` (6 subsequent siblings)
  18 siblings, 0 replies; 45+ 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] 45+ messages in thread
* [PATCH v2 18/19] drm/rockchip: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
@ 2019-07-16  6:42   ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
                     ` (17 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel
  Cc: David Airlie, linux-rockchip, 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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 18/19] drm/rockchip: drop use of drmP.h
@ 2019-07-16  6:42   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
@ 2019-07-16  6:42   ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
                     ` (17 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:42 UTC (permalink / raw)
  To: dri-devel
  Cc: David Airlie, Matthias Brugger, linux-mediatek, Sam Ravnborg,
	linux-arm-kernel, Emil Velikov

Drop use of the deprecated drmP.h header file.

While touching the include files divide them up in blocks
in the typical order:

\#include <linux/*>

\#include <video/*>

\#include <drm/*>

\#include ""

And sort the includes in the blocks
Add the necessary includes to fix build after removal of drmP.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
---
 drivers/gpu/drm/mediatek/mtk_disp_color.c   |  2 +-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c     |  2 +-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c    |  2 +-
 drivers/gpu/drm/mediatek/mtk_dpi.c          | 18 ++++++++++--------
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 10 ++++++----
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c |  2 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 16 ++++++++++------
 drivers/gpu/drm/mediatek/mtk_drm_fb.c       |  7 ++++---
 drivers/gpu/drm/mediatek/mtk_drm_gem.c      |  6 ++++--
 drivers/gpu/drm/mediatek/mtk_drm_plane.c    |  2 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c          | 14 ++++++++------
 drivers/gpu/drm/mediatek/mtk_hdmi.c         | 14 +++++++++-----
 12 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c
index f33d98b356d6..59de2a46aa49 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2017 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index c4f07c28c74f..21851756c579 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index 9a6f0a29e43c..405afef31407 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index bacd989cc9aa..be6d95c5ff25 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -3,21 +3,23 @@
  * Copyright (c) 2014 MediaTek Inc.
  * Author: Jie Qiu <jie.qiu@mediatek.com>
  */
-#include <drm/drmP.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_of.h>
-#include <linux/kernel.h>
+
+#include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_graph.h>
-#include <linux/interrupt.h>
+#include <linux/platform_device.h>
 #include <linux/types.h>
-#include <linux/clk.h>
+
 #include <video/videomode.h>
 
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_of.h>
+
 #include "mtk_dpi_regs.h"
 #include "mtk_drm_ddp_comp.h"
 
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index a9007210dda1..34a731755791 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -3,14 +3,16 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
+#include <linux/clk.h>
+#include <linux/pm_runtime.h>
+
 #include <asm/barrier.h>
-#include <drm/drmP.h>
+#include <soc/mediatek/smi.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
-#include <linux/clk.h>
-#include <linux/pm_runtime.h>
-#include <soc/mediatek/smi.h>
+#include <drm/drm_vblank.h>
 
 #include "mtk_drm_drv.h"
 #include "mtk_drm_crtc.h"
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index b38963f1f2ec..efa85973e46b 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -12,7 +12,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
-#include <drm/drmP.h>
+
 #include "mtk_drm_drv.h"
 #include "mtk_drm_plane.h"
 #include "mtk_drm_ddp_comp.h"
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 2d5caf532431..2ee809a6f3dc 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -4,22 +4,26 @@
  * Author: YT SHEN <yt.shen@mediatek.com>
  */
 
-#include <drm/drmP.h>
+#include <linux/component.h>
+#include <linux/iommu.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
-#include <linux/component.h>
-#include <linux/iommu.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/pm_runtime.h>
+#include <drm/drm_vblank.h>
 
 #include "mtk_drm_crtc.h"
 #include "mtk_drm_ddp.h"
+#include "mtk_drm_ddp.h"
 #include "mtk_drm_ddp_comp.h"
 #include "mtk_drm_drv.h"
 #include "mtk_drm_fb.h"
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
index 396ba497986d..ae40b080ae47 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
@@ -3,13 +3,14 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
+#include <linux/dma-buf.h>
+#include <linux/reservation.h>
+
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_gem_framebuffer_helper.h>
-#include <linux/dma-buf.h>
-#include <linux/reservation.h>
 
 #include "mtk_drm_drv.h"
 #include "mtk_drm_fb.h"
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index 0d69698f8173..9434f88c6341 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -3,10 +3,12 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_gem.h>
 #include <linux/dma-buf.h>
 
+#include <drm/drm_device.h>
+#include <drm/drm_gem.h>
+#include <drm/drm_prime.h>
+
 #include "mtk_drm_drv.h"
 #include "mtk_drm_gem.h"
 
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 42cc9823eaaa..584a9ecadce6 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -4,9 +4,9 @@
  * Author: CK Hu <ck.hu@mediatek.com>
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index b91c4616644a..224afb666881 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -3,12 +3,6 @@
  * Copyright (c) 2015 MediaTek Inc.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_mipi_dsi.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_of.h>
-#include <drm/drm_probe_helper.h>
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/iopoll.h>
@@ -17,9 +11,17 @@
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+
 #include <video/mipi_display.h>
 #include <video/videomode.h>
 
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
 #include "mtk_drm_ddp_comp.h"
 
 #define DSI_START		0x00
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 5d6a9f094df5..ce91b61364eb 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -3,11 +3,7 @@
  * Copyright (c) 2014 MediaTek Inc.
  * Author: Jie Qiu <jie.qiu@mediatek.com>
  */
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_edid.h>
+
 #include <linux/arm-smccc.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -23,7 +19,15 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+
 #include <sound/hdmi-codec.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
 #include "mtk_cec.h"
 #include "mtk_hdmi.h"
 #include "mtk_hdmi_regs.h"
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 45+ messages in thread
* [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
@ 2019-07-16  6:42   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
  2019-07-16  6:42   ` Sam Ravnborg
@ 2019-07-16  6:50   ` Sam Ravnborg
  2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
                     ` (16 subsequent siblings)
  18 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16  6:50 UTC (permalink / raw)
  To: dri-devel
  Cc: Maxime Jourdan, Heiko Stübner, Neil Armstrong, David Airlie,
	Alexandru-Cosmin Gheorghe, Eric Anholt, Fabio Estevam,
	Jerome Brunet, Deepak Sharma, Maxime Ripard,
	Oleksandr Andrushchenko, Kevin Hilman, linux-rockchip,
	Chen-Yu Tsai, Tomi Valkeinen, NXP Linux Team, CK Hu,
	Philipp Zabel, Francisco Jerez, Eugeniy Paltsev, Dan Carpenter

Copied all recipients on the cover letter.
As the list is long this mail may not hit the mailing lists.

	Sam

On Tue, Jul 16, 2019 at 08:42:01AM +0200, Sam Ravnborg wrote:
> This patch set removes a far share of the remaining uses of drmP.h.
> Common for all patches are that the respective files are maintained
> in drm-misc.
> All patches are independent.
> 
> Patches have all been build tested with various configs and various
> architectures.
> There are likely introduced a few build issues that randconfig
> build will reveal, but for all configs I have used the build was OK.
> 
> This patchset does not conclude the quest to kill all uses
> of drmP.h, but it is a major step towards the goal.
> 
> Please review/ack.
> I plan to apply the patches to drm-misc, but feel free
> to do it yourself.
> 
> There will be conflicts with the ongoing work on ttm, gem etc.
> But let's deal with the conflicts when they hit us - it
> is simple conflicts in the list of include files.
> 
> v2:
> - Removed merged patches
> - Added ack from Emil Velikov to the full series
> - Rebased on top of drm-misc-next
> - Hand-edited the list of Cc: as get_maintainer.pl in some
>   cases looks up too much people, due to cross kernel commits
> 
>         Sam
> 
> Sam Ravnborg (19):
>       drm/meson: drop use of drmP.h
>       drm/v3d: drop use of drmP.h
>       drm/pl111: drop use of drmP.h
>       drm/zte: drop use of drmP.h
>       drm/sun4i: drop use of drmP.h
>       drm/vc4: drop use of drmP.h
>       drm/r128: drop use of drmP.h
>       drm/udl: drop use of drmP.h
>       drm/omapdrm: drop use of drmP.h
>       drm/selftests: drop use of drmP.h
>       drm/tdfx: drop use of drmP.h
>       drm/vgem: drop use of drmP.h
>       drm/i810: drop use of drmP.h
>       drm/tilcdc: drop use of drmP.h
>       drm/i2c/ch7006: drop use of drmP.h
>       drm/i2c/sil164: drop use of drmP.h
>       drm/imx: drop use of drmP.h
>       drm/rockchip: drop use of drmP.h
>       drm/mediatek: drop use of drmP.h
> 
>  drivers/gpu/drm/i2c/ch7006_priv.h                |  1 -
>  drivers/gpu/drm/i2c/sil164_drv.c                 |  3 ++-
>  drivers/gpu/drm/i810/i810_dma.c                  | 17 +++++++++----
>  drivers/gpu/drm/i810/i810_drv.c                  |  8 +++---
>  drivers/gpu/drm/i810/i810_drv.h                  |  2 ++
>  drivers/gpu/drm/imx/dw_hdmi-imx.c                | 14 ++++++-----
>  drivers/gpu/drm/imx/imx-drm-core.c               |  8 ++++--
>  drivers/gpu/drm/imx/imx-ldb.c                    | 22 +++++++++--------
>  drivers/gpu/drm/imx/imx-tve.c                    | 10 +++++---
>  drivers/gpu/drm/imx/ipuv3-crtc.c                 |  8 ++++--
>  drivers/gpu/drm/imx/ipuv3-plane.c                |  5 ++--
>  drivers/gpu/drm/imx/parallel-display.c           |  8 +++---
>  drivers/gpu/drm/mediatek/mtk_disp_color.c        |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c          |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_rdma.c         |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dpi.c               | 18 ++++++++------
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c          | 10 +++++---
>  drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c      |  2 +-
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c           | 16 +++++++-----
>  drivers/gpu/drm/mediatek/mtk_drm_fb.c            |  7 +++---
>  drivers/gpu/drm/mediatek/mtk_drm_gem.c           |  6 +++--
>  drivers/gpu/drm/mediatek/mtk_drm_plane.c         |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dsi.c               | 14 ++++++-----
>  drivers/gpu/drm/mediatek/mtk_hdmi.c              | 14 +++++++----
>  drivers/gpu/drm/meson/meson_crtc.c               | 16 ++++++------
>  drivers/gpu/drm/meson/meson_drv.c                | 27 +++++++++------------
>  drivers/gpu/drm/meson/meson_drv.h                | 11 ++++++---
>  drivers/gpu/drm/meson/meson_dw_hdmi.c            | 19 ++++++++-------
>  drivers/gpu/drm/meson/meson_overlay.c            | 13 ++++------
>  drivers/gpu/drm/meson/meson_plane.c              | 16 +++++-------
>  drivers/gpu/drm/meson/meson_registers.h          |  2 ++
>  drivers/gpu/drm/meson/meson_vclk.c               |  7 +++---
>  drivers/gpu/drm/meson/meson_vclk.h               |  4 +++
>  drivers/gpu/drm/meson/meson_venc.c               | 10 ++++----
>  drivers/gpu/drm/meson/meson_venc.h               |  2 ++
>  drivers/gpu/drm/meson/meson_venc_cvbs.c          | 11 ++++-----
>  drivers/gpu/drm/meson/meson_viu.c                |  7 ++----
>  drivers/gpu/drm/meson/meson_vpp.c                |  7 +++---
>  drivers/gpu/drm/meson/meson_vpp.h                |  3 +++
>  drivers/gpu/drm/omapdrm/omap_crtc.c              |  4 ++-
>  drivers/gpu/drm/omapdrm/omap_debugfs.c           |  2 ++
>  drivers/gpu/drm/omapdrm/omap_drv.c               | 10 ++++++--
>  drivers/gpu/drm/omapdrm/omap_drv.h               |  5 ++--
>  drivers/gpu/drm/omapdrm/omap_fb.c                |  4 +--
>  drivers/gpu/drm/omapdrm/omap_fbdev.c             |  2 ++
>  drivers/gpu/drm/omapdrm/omap_gem.c               |  2 ++
>  drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c        |  3 +++
>  drivers/gpu/drm/omapdrm/omap_irq.c               |  2 ++
>  drivers/gpu/drm/pl111/pl111_debugfs.c            |  4 ++-
>  drivers/gpu/drm/pl111/pl111_display.c            |  6 +++--
>  drivers/gpu/drm/pl111/pl111_drm.h                | 11 +++++----
>  drivers/gpu/drm/pl111/pl111_drv.c                |  9 ++++---
>  drivers/gpu/drm/pl111/pl111_nomadik.h            |  3 ++-
>  drivers/gpu/drm/pl111/pl111_versatile.c          |  9 ++++---
>  drivers/gpu/drm/pl111/pl111_versatile.h          |  3 +++
>  drivers/gpu/drm/r128/r128_ioc32.c                |  3 ++-
>  drivers/gpu/drm/r128/r128_irq.c                  |  5 +++-
>  drivers/gpu/drm/rockchip/analogix_dp-rockchip.c  | 10 +++-----
>  drivers/gpu/drm/rockchip/cdn-dp-core.c           | 17 ++++++-------
>  drivers/gpu/drm/rockchip/cdn-dp-core.h           |  2 +-
>  drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c  |  9 ++++---
>  drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c      |  5 ++--
>  drivers/gpu/drm/rockchip/inno_hdmi.c             |  3 +--
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.c      | 12 +++++----
>  drivers/gpu/drm/rockchip/rockchip_drm_fb.c       |  3 ++-
>  drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c    |  2 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_gem.c      |  8 +++---
>  drivers/gpu/drm/rockchip/rockchip_drm_psr.c      |  1 -
>  drivers/gpu/drm/rockchip/rockchip_drm_vop.c      | 31 ++++++++++++------------
>  drivers/gpu/drm/rockchip/rockchip_lvds.c         | 16 ++++++------
>  drivers/gpu/drm/rockchip/rockchip_rgb.c          |  9 +++----
>  drivers/gpu/drm/rockchip/rockchip_vop_reg.c      | 11 ++++++---
>  drivers/gpu/drm/selftests/test-drm_framebuffer.c |  7 +++++-
>  drivers/gpu/drm/sun4i/sun4i_backend.c            | 16 ++++++------
>  drivers/gpu/drm/sun4i/sun4i_crtc.c               | 13 +++++-----
>  drivers/gpu/drm/sun4i/sun4i_drv.c                |  5 +++-
>  drivers/gpu/drm/sun4i/sun4i_framebuffer.c        |  1 -
>  drivers/gpu/drm/sun4i/sun4i_frontend.c           | 10 +++++---
>  drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c           | 17 +++++++------
>  drivers/gpu/drm/sun4i/sun4i_layer.c              |  3 +--
>  drivers/gpu/drm/sun4i/sun4i_lvds.c               |  2 +-
>  drivers/gpu/drm/sun4i/sun4i_rgb.c                |  2 +-
>  drivers/gpu/drm/sun4i/sun4i_tcon.c               | 20 ++++++++-------
>  drivers/gpu/drm/sun4i/sun4i_tv.c                 |  4 ++-
>  drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c           |  9 ++++---
>  drivers/gpu/drm/sun4i/sun8i_csc.c                |  2 +-
>  drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c            |  3 +--
>  drivers/gpu/drm/sun4i/sun8i_mixer.c              | 14 +++++------
>  drivers/gpu/drm/sun4i/sun8i_tcon_top.c           |  6 ++---
>  drivers/gpu/drm/sun4i/sun8i_ui_layer.c           |  2 +-
>  drivers/gpu/drm/sun4i/sun8i_vi_layer.c           |  1 -
>  drivers/gpu/drm/tdfx/tdfx_drv.c                  | 11 ++++++---
>  drivers/gpu/drm/tilcdc/tilcdc_crtc.c             | 18 ++++++++------
>  drivers/gpu/drm/tilcdc/tilcdc_drv.c              | 19 ++++++++++++---
>  drivers/gpu/drm/tilcdc/tilcdc_drv.h              | 31 +++++++++++++-----------
>  drivers/gpu/drm/tilcdc/tilcdc_external.c         |  1 +
>  drivers/gpu/drm/tilcdc/tilcdc_panel.c            | 11 ++++++---
>  drivers/gpu/drm/tilcdc/tilcdc_plane.c            |  4 +--
>  drivers/gpu/drm/tilcdc/tilcdc_tfp410.c           |  8 +++---
>  drivers/gpu/drm/udl/udl_connector.c              |  4 +--
>  drivers/gpu/drm/udl/udl_connector.h              |  2 ++
>  drivers/gpu/drm/udl/udl_dmabuf.c                 |  6 +++--
>  drivers/gpu/drm/udl/udl_drv.c                    |  7 +++++-
>  drivers/gpu/drm/udl/udl_drv.h                    |  8 +++++-
>  drivers/gpu/drm/udl/udl_encoder.c                |  6 ++---
>  drivers/gpu/drm/udl/udl_fb.c                     | 15 ++++++------
>  drivers/gpu/drm/udl/udl_gem.c                    |  9 ++++---
>  drivers/gpu/drm/udl/udl_main.c                   |  6 +++--
>  drivers/gpu/drm/udl/udl_modeset.c                |  6 ++---
>  drivers/gpu/drm/udl/udl_transfer.c               |  4 ---
>  drivers/gpu/drm/v3d/v3d_debugfs.c                |  3 ++-
>  drivers/gpu/drm/v3d/v3d_drv.c                    |  5 +++-
>  drivers/gpu/drm/v3d/v3d_drv.h                    | 13 ++++++++--
>  drivers/gpu/drm/v3d/v3d_gem.c                    | 12 +++++----
>  drivers/gpu/drm/v3d/v3d_irq.c                    |  2 ++
>  drivers/gpu/drm/vc4/vc4_crtc.c                   | 11 ++++++---
>  drivers/gpu/drm/vc4/vc4_debugfs.c                |  1 -
>  drivers/gpu/drm/vc4/vc4_drv.c                    |  7 +++++-
>  drivers/gpu/drm/vc4/vc4_drv.h                    | 17 +++++++++----
>  drivers/gpu/drm/vc4/vc4_dsi.c                    | 17 +++++++------
>  drivers/gpu/drm/vc4/vc4_gem.c                    |  2 ++
>  drivers/gpu/drm/vc4/vc4_hvs.c                    |  5 +++-
>  drivers/gpu/drm/vc4/vc4_kms.c                    |  4 ++-
>  drivers/gpu/drm/vc4/vc4_plane.c                  |  6 +++--
>  drivers/gpu/drm/vc4/vc4_txp.c                    | 14 ++++++-----
>  drivers/gpu/drm/vc4/vc4_v3d.c                    |  4 +++
>  drivers/gpu/drm/vgem/vgem_drv.c                  | 11 +++++++--
>  drivers/gpu/drm/vgem/vgem_drv.h                  |  1 -
>  drivers/gpu/drm/vgem/vgem_fence.c                |  2 ++
>  drivers/gpu/drm/zte/zx_drm_drv.c                 |  3 ++-
>  drivers/gpu/drm/zte/zx_hdmi.c                    |  2 +-
>  drivers/gpu/drm/zte/zx_plane.c                   |  2 +-
>  drivers/gpu/drm/zte/zx_tvenc.c                   |  4 ++-
>  drivers/gpu/drm/zte/zx_vga.c                     |  4 ++-
>  drivers/gpu/drm/zte/zx_vou.c                     |  5 +++-
>  include/linux/soc/amlogic/meson-canvas.h         |  1 +
>  136 files changed, 626 insertions(+), 427 deletions(-)
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
@ 2019-07-16  6:50   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
@ 2019-07-16  6:50   ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
  2019-07-16  6:42   ` Sam Ravnborg
@ 2019-07-16  7:44     ` CK Hu
  -1 siblings, 0 replies; 45+ messages in thread
From: CK Hu @ 2019-07-16  7:44 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: David Airlie, dri-devel, linux-mediatek, Matthias Brugger,
	linux-arm-kernel, Emil Velikov

Hi, Sam:

On Tue, 2019-07-16 at 08:42 +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header file.
> 
> While touching the include files divide them up in blocks
> in the typical order:
> 
> \#include <linux/*>
> 
> \#include <video/*>
> 
> \#include <drm/*>
> 
> \#include ""
> 
> And sort the includes in the blocks
> Add the necessary includes to fix build after removal of drmP.h

Reviewed-by: CK Hu <ck.hu@mediatek.com>

Thanks.

> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> ---
>  drivers/gpu/drm/mediatek/mtk_disp_color.c   |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c     |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_rdma.c    |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dpi.c          | 18 ++++++++++--------
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 10 ++++++----
>  drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c |  2 +-
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 16 ++++++++++------
>  drivers/gpu/drm/mediatek/mtk_drm_fb.c       |  7 ++++---
>  drivers/gpu/drm/mediatek/mtk_drm_gem.c      |  6 ++++--
>  drivers/gpu/drm/mediatek/mtk_drm_plane.c    |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dsi.c          | 14 ++++++++------
>  drivers/gpu/drm/mediatek/mtk_hdmi.c         | 14 +++++++++-----
>  12 files changed, 56 insertions(+), 39 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> index f33d98b356d6..59de2a46aa49 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2017 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index c4f07c28c74f..21851756c579 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> index 9a6f0a29e43c..405afef31407 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index bacd989cc9aa..be6d95c5ff25 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -3,21 +3,23 @@
>   * Copyright (c) 2014 MediaTek Inc.
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_of.h>
> -#include <linux/kernel.h>
> +
> +#include <linux/clk.h>
>  #include <linux/component.h>
> -#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
>  #include <linux/of_graph.h>
> -#include <linux/interrupt.h>
> +#include <linux/platform_device.h>
>  #include <linux/types.h>
> -#include <linux/clk.h>
> +
>  #include <video/videomode.h>
>  
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_of.h>
> +
>  #include "mtk_dpi_regs.h"
>  #include "mtk_drm_ddp_comp.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index a9007210dda1..34a731755791 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -3,14 +3,16 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> +#include <linux/clk.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <asm/barrier.h>
> -#include <drm/drmP.h>
> +#include <soc/mediatek/smi.h>
> +
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_probe_helper.h>
> -#include <linux/clk.h>
> -#include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
> +#include <drm/drm_vblank.h>
>  
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_crtc.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index b38963f1f2ec..efa85973e46b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -12,7 +12,7 @@
>  #include <linux/of_irq.h>
>  #include <linux/of_platform.h>
>  #include <linux/platform_device.h>
> -#include <drm/drmP.h>
> +
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_plane.h"
>  #include "mtk_drm_ddp_comp.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 2d5caf532431..2ee809a6f3dc 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -4,22 +4,26 @@
>   * Author: YT SHEN <yt.shen@mediatek.com>
>   */
>  
> -#include <drm/drmP.h>
> +#include <linux/component.h>
> +#include <linux/iommu.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_drv.h>
>  #include <drm/drm_fb_helper.h>
>  #include <drm/drm_gem.h>
>  #include <drm/drm_gem_cma_helper.h>
>  #include <drm/drm_of.h>
>  #include <drm/drm_probe_helper.h>
> -#include <linux/component.h>
> -#include <linux/iommu.h>
> -#include <linux/of_address.h>
> -#include <linux/of_platform.h>
> -#include <linux/pm_runtime.h>
> +#include <drm/drm_vblank.h>
>  
>  #include "mtk_drm_crtc.h"
>  #include "mtk_drm_ddp.h"
> +#include "mtk_drm_ddp.h"
>  #include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_fb.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> index 396ba497986d..ae40b080ae47 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> @@ -3,13 +3,14 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
> +#include <linux/dma-buf.h>
> +#include <linux/reservation.h>
> +
>  #include <drm/drm_modeset_helper.h>
>  #include <drm/drm_fb_helper.h>
> +#include <drm/drm_fourcc.h>
>  #include <drm/drm_gem.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
> -#include <linux/dma-buf.h>
> -#include <linux/reservation.h>
>  
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_fb.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index 0d69698f8173..9434f88c6341 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -3,10 +3,12 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
> -#include <drm/drm_gem.h>
>  #include <linux/dma-buf.h>
>  
> +#include <drm/drm_device.h>
> +#include <drm/drm_gem.h>
> +#include <drm/drm_prime.h>
> +
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_gem.h"
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 42cc9823eaaa..584a9ecadce6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -4,9 +4,9 @@
>   * Author: CK Hu <ck.hu@mediatek.com>
>   */
>  
> -#include <drm/drmP.h>
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_fourcc.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index b91c4616644a..224afb666881 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -3,12 +3,6 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>  
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_mipi_dsi.h>
> -#include <drm/drm_panel.h>
> -#include <drm/drm_of.h>
> -#include <drm/drm_probe_helper.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/iopoll.h>
> @@ -17,9 +11,17 @@
>  #include <linux/of_platform.h>
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
> +
>  #include <video/mipi_display.h>
>  #include <video/videomode.h>
>  
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_probe_helper.h>
> +
>  #include "mtk_drm_ddp_comp.h"
>  
>  #define DSI_START		0x00
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 5d6a9f094df5..ce91b61364eb 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -3,11 +3,7 @@
>   * Copyright (c) 2014 MediaTek Inc.
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_probe_helper.h>
> -#include <drm/drm_edid.h>
> +
>  #include <linux/arm-smccc.h>
>  #include <linux/clk.h>
>  #include <linux/delay.h>
> @@ -23,7 +19,15 @@
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
> +
>  #include <sound/hdmi-codec.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_probe_helper.h>
> +
>  #include "mtk_cec.h"
>  #include "mtk_hdmi.h"
>  #include "mtk_hdmi_regs.h"


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
@ 2019-07-16  7:44     ` CK Hu
  0 siblings, 0 replies; 45+ 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] 45+ 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; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 05/19] drm/sun4i: drop use of drmP.h
@ 2019-07-16  8:28     ` Maxime Ripard
  0 siblings, 0 replies; 45+ 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, 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 07/19] drm/r128: drop use of drmP.h
  2019-07-16  6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
@ 2019-07-16 14:01   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:01 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: David Airlie, Maling list - DRI developers, Emil Velikov

On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Replace use of the deprecated drmP.h header file
> with relevant includes.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/r128/r128_ioc32.c | 3 ++-
>  drivers/gpu/drm/r128/r128_irq.c   | 5 ++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
> index 6589f9e0310e..6ac71755c22d 100644
> --- a/drivers/gpu/drm/r128/r128_ioc32.c
> +++ b/drivers/gpu/drm/r128/r128_ioc32.c
> @@ -29,10 +29,11 @@
>   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>   * IN THE SOFTWARE.
>   */
> +
>  #include <linux/compat.h>
>
> -#include <drm/drmP.h>
>  #include <drm/r128_drm.h>
> +
>  #include "r128_drv.h"
>
>  typedef struct drm_r128_init32 {
> diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
> index 9730f4918944..d84e9c96e20a 100644
> --- a/drivers/gpu/drm/r128/r128_irq.c
> +++ b/drivers/gpu/drm/r128/r128_irq.c
> @@ -30,8 +30,11 @@
>   *    Eric Anholt <anholt@FreeBSD.org>
>   */
>
> -#include <drm/drmP.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_vblank.h>
>  #include <drm/r128_drm.h>
> +
>  #include "r128_drv.h"
>
>  u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 10/19] drm/selftests: drop use of drmP.h
  2019-07-16  6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
@ 2019-07-16 14:02   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:02 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: David Airlie, Alexandru-Cosmin Gheorghe,
	Maling list - DRI developers, Emil Velikov

On Tue, Jul 16, 2019 at 2:45 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Drop the single user of drmP.h - replace it with relevant includes.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Alexandru-Cosmin Gheorghe <Alexandru-Cosmin.Gheorghe@arm.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> index a04d02dacce2..74d5561a862b 100644
> --- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> +++ b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> @@ -3,7 +3,12 @@
>   * Test cases for the drm_framebuffer functions
>   */
>
> -#include <drm/drmP.h>
> +#include <linux/kernel.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_mode.h>
> +#include <drm/drm_fourcc.h>
> +
>  #include "../drm_crtc_internal.h"
>
>  #include "test-drm_modeset_common.h"
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
  2019-07-16  6:42   ` Sam Ravnborg
@ 2019-07-16 14:02     ` Alex Deucher
  -1 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:02 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: David Airlie, Maling list - DRI developers, linux-mediatek,
	Matthias Brugger, linux-arm-kernel, Emil Velikov

On Tue, Jul 16, 2019 at 2:45 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Drop use of the deprecated drmP.h header file.
>
> While touching the include files divide them up in blocks
> in the typical order:
>
> \#include <linux/*>
>
> \#include <video/*>
>
> \#include <drm/*>
>
> \#include ""
>
> And sort the includes in the blocks
> Add the necessary includes to fix build after removal of drmP.h
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org


Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/mediatek/mtk_disp_color.c   |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_ovl.c     |  2 +-
>  drivers/gpu/drm/mediatek/mtk_disp_rdma.c    |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dpi.c          | 18 ++++++++++--------
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 10 ++++++----
>  drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c |  2 +-
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 16 ++++++++++------
>  drivers/gpu/drm/mediatek/mtk_drm_fb.c       |  7 ++++---
>  drivers/gpu/drm/mediatek/mtk_drm_gem.c      |  6 ++++--
>  drivers/gpu/drm/mediatek/mtk_drm_plane.c    |  2 +-
>  drivers/gpu/drm/mediatek/mtk_dsi.c          | 14 ++++++++------
>  drivers/gpu/drm/mediatek/mtk_hdmi.c         | 14 +++++++++-----
>  12 files changed, 56 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> index f33d98b356d6..59de2a46aa49 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2017 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index c4f07c28c74f..21851756c579 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> index 9a6f0a29e43c..405afef31407 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> @@ -3,9 +3,9 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
>  #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index bacd989cc9aa..be6d95c5ff25 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -3,21 +3,23 @@
>   * Copyright (c) 2014 MediaTek Inc.
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_of.h>
> -#include <linux/kernel.h>
> +
> +#include <linux/clk.h>
>  #include <linux/component.h>
> -#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
>  #include <linux/of_graph.h>
> -#include <linux/interrupt.h>
> +#include <linux/platform_device.h>
>  #include <linux/types.h>
> -#include <linux/clk.h>
> +
>  #include <video/videomode.h>
>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_of.h>
> +
>  #include "mtk_dpi_regs.h"
>  #include "mtk_drm_ddp_comp.h"
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index a9007210dda1..34a731755791 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -3,14 +3,16 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> +#include <linux/clk.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <asm/barrier.h>
> -#include <drm/drmP.h>
> +#include <soc/mediatek/smi.h>
> +
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_probe_helper.h>
> -#include <linux/clk.h>
> -#include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
> +#include <drm/drm_vblank.h>
>
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_crtc.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index b38963f1f2ec..efa85973e46b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -12,7 +12,7 @@
>  #include <linux/of_irq.h>
>  #include <linux/of_platform.h>
>  #include <linux/platform_device.h>
> -#include <drm/drmP.h>
> +
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_plane.h"
>  #include "mtk_drm_ddp_comp.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 2d5caf532431..2ee809a6f3dc 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -4,22 +4,26 @@
>   * Author: YT SHEN <yt.shen@mediatek.com>
>   */
>
> -#include <drm/drmP.h>
> +#include <linux/component.h>
> +#include <linux/iommu.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_drv.h>
>  #include <drm/drm_fb_helper.h>
>  #include <drm/drm_gem.h>
>  #include <drm/drm_gem_cma_helper.h>
>  #include <drm/drm_of.h>
>  #include <drm/drm_probe_helper.h>
> -#include <linux/component.h>
> -#include <linux/iommu.h>
> -#include <linux/of_address.h>
> -#include <linux/of_platform.h>
> -#include <linux/pm_runtime.h>
> +#include <drm/drm_vblank.h>
>
>  #include "mtk_drm_crtc.h"
>  #include "mtk_drm_ddp.h"
> +#include "mtk_drm_ddp.h"
>  #include "mtk_drm_ddp_comp.h"
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_fb.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> index 396ba497986d..ae40b080ae47 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c
> @@ -3,13 +3,14 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
> +#include <linux/dma-buf.h>
> +#include <linux/reservation.h>
> +
>  #include <drm/drm_modeset_helper.h>
>  #include <drm/drm_fb_helper.h>
> +#include <drm/drm_fourcc.h>
>  #include <drm/drm_gem.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
> -#include <linux/dma-buf.h>
> -#include <linux/reservation.h>
>
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_fb.h"
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index 0d69698f8173..9434f88c6341 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -3,10 +3,12 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_gem.h>
>  #include <linux/dma-buf.h>
>
> +#include <drm/drm_device.h>
> +#include <drm/drm_gem.h>
> +#include <drm/drm_prime.h>
> +
>  #include "mtk_drm_drv.h"
>  #include "mtk_drm_gem.h"
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 42cc9823eaaa..584a9ecadce6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -4,9 +4,9 @@
>   * Author: CK Hu <ck.hu@mediatek.com>
>   */
>
> -#include <drm/drmP.h>
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_fourcc.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index b91c4616644a..224afb666881 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -3,12 +3,6 @@
>   * Copyright (c) 2015 MediaTek Inc.
>   */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_mipi_dsi.h>
> -#include <drm/drm_panel.h>
> -#include <drm/drm_of.h>
> -#include <drm/drm_probe_helper.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/iopoll.h>
> @@ -17,9 +11,17 @@
>  #include <linux/of_platform.h>
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
> +
>  #include <video/mipi_display.h>
>  #include <video/videomode.h>
>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_probe_helper.h>
> +
>  #include "mtk_drm_ddp_comp.h"
>
>  #define DSI_START              0x00
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 5d6a9f094df5..ce91b61364eb 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -3,11 +3,7 @@
>   * Copyright (c) 2014 MediaTek Inc.
>   * Author: Jie Qiu <jie.qiu@mediatek.com>
>   */
> -#include <drm/drmP.h>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_probe_helper.h>
> -#include <drm/drm_edid.h>
> +
>  #include <linux/arm-smccc.h>
>  #include <linux/clk.h>
>  #include <linux/delay.h>
> @@ -23,7 +19,15 @@
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
> +
>  #include <sound/hdmi-codec.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_probe_helper.h>
> +
>  #include "mtk_cec.h"
>  #include "mtk_hdmi.h"
>  #include "mtk_hdmi_regs.h"
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
@ 2019-07-16 14:02     ` Alex Deucher
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 01/19] drm/meson: drop use of drmP.h
  2019-07-16  6:42   ` Sam Ravnborg
  (?)
@ 2019-07-16 14:03     ` Alex Deucher
  -1 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 01/19] drm/meson: drop use of drmP.h
@ 2019-07-16 14:03     ` Alex Deucher
  0 siblings, 0 replies; 45+ 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 01/19] drm/meson: drop use of drmP.h
@ 2019-07-16 14:03     ` Alex Deucher
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 02/19] drm/v3d: drop use of drmP.h
  2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
@ 2019-07-16 14:06   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:06 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: David Airlie, Maling list - DRI developers, 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 file.
> Made v3d_drv.h self-contained with only sufficient
> include files.
> Fixed fallout in remaining files.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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 ++
>  5 files changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c
> index 78a78938e81f..9e953ce64ef7 100644
> --- a/drivers/gpu/drm/v3d/v3d_debugfs.c
> +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
> @@ -6,7 +6,8 @@
>  #include <linux/debugfs.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/seq_file.h>
> -#include <drm/drmP.h>
> +
> +#include <drm/drm_debugfs.h>
>
>  #include "v3d_drv.h"
>  #include "v3d_regs.h"
> diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
> index a1604705faee..3506ae2723ae 100644
> --- a/drivers/gpu/drm/v3d/v3d_drv.c
> +++ b/drivers/gpu/drm/v3d/v3d_drv.c
> @@ -14,16 +14,19 @@
>
>  #include <linux/clk.h>
>  #include <linux/device.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/io.h>
>  #include <linux/module.h>
>  #include <linux/of_platform.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/reset.h>
> +
> +#include <drm/drm_drv.h>
>  #include <drm/drm_fb_cma_helper.h>
>  #include <drm/drm_fb_helper.h>
> +#include <uapi/drm/v3d_drm.h>
>
> -#include "uapi/drm/v3d_drm.h"
>  #include "v3d_drv.h"
>  #include "v3d_regs.h"
>
> diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
> index 9aad9da1eb11..9a35c555ec52 100644
> --- a/drivers/gpu/drm/v3d/v3d_drv.h
> +++ b/drivers/gpu/drm/v3d/v3d_drv.h
> @@ -1,14 +1,23 @@
>  // SPDX-License-Identifier: GPL-2.0+
>  /* Copyright (C) 2015-2018 Broadcom */
>
> -#include <linux/mm_types.h>
> -#include <drm/drmP.h>
> +#include <linux/delay.h>
> +#include <linux/mutex.h>
> +#include <linux/spinlock_types.h>
> +#include <linux/workqueue.h>
> +
>  #include <drm/drm_encoder.h>
>  #include <drm/drm_gem.h>
>  #include <drm/drm_gem_shmem_helper.h>
>  #include <drm/gpu_scheduler.h>
> +
>  #include "uapi/drm/v3d_drm.h"
>
> +struct clk;
> +struct device;
> +struct platform_device;
> +struct reset_control;
> +
>  #define GMP_GRANULARITY (128 * 1024)
>
>  /* Enum for each of the V3D queues. */
> diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
> index 27e0f87075d9..79744137d89f 100644
> --- a/drivers/gpu/drm/v3d/v3d_gem.c
> +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> @@ -1,17 +1,19 @@
>  // SPDX-License-Identifier: GPL-2.0+
>  /* Copyright (C) 2014-2018 Broadcom */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_syncobj.h>
> +#include <linux/device.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/io.h>
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/reset.h>
> -#include <linux/device.h>
> -#include <linux/io.h>
>  #include <linux/sched/signal.h>
> +#include <linux/uaccess.h>
> +
> +#include <drm/drm_syncobj.h>
> +#include <uapi/drm/v3d_drm.h>
>
> -#include "uapi/drm/v3d_drm.h"
>  #include "v3d_drv.h"
>  #include "v3d_regs.h"
>  #include "v3d_trace.h"
> diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
> index 268d8a889ac5..662e67279a7b 100644
> --- a/drivers/gpu/drm/v3d/v3d_irq.c
> +++ b/drivers/gpu/drm/v3d/v3d_irq.c
> @@ -13,6 +13,8 @@
>   * current job can make progress.
>   */
>
> +#include <linux/platform_device.h>
> +
>  #include "v3d_drv.h"
>  #include "v3d_regs.h"
>  #include "v3d_trace.h"
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 03/19] drm/pl111: drop use of drmP.h
  2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
@ 2019-07-16 14:06   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:06 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: David Airlie, Maling list - DRI developers, 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.
> Sort includes in blocks while touching the files.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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 +++
>  7 files changed, 28 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/pl111/pl111_debugfs.c b/drivers/gpu/drm/pl111/pl111_debugfs.c
> index 7ddc7e3b9e7d..7accfd6f7bde 100644
> --- a/drivers/gpu/drm/pl111/pl111_debugfs.c
> +++ b/drivers/gpu/drm/pl111/pl111_debugfs.c
> @@ -8,8 +8,10 @@
>
>  #include <linux/amba/clcd-regs.h>
>  #include <linux/seq_file.h>
> +
>  #include <drm/drm_debugfs.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_file.h>
> +
>  #include "pl111_drm.h"
>
>  #define REGDEF(reg) { reg, #reg }
> diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
> index 15d2755fdba4..a246195dc606 100644
> --- a/drivers/gpu/drm/pl111/pl111_display.c
> +++ b/drivers/gpu/drm/pl111/pl111_display.c
> @@ -11,14 +11,16 @@
>
>  #include <linux/amba/clcd-regs.h>
>  #include <linux/clk.h>
> +#include <linux/delay.h>
>  #include <linux/version.h>
>  #include <linux/dma-buf.h>
>  #include <linux/of_graph.h>
>
> -#include <drm/drmP.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_fb_cma_helper.h>
> +#include <drm/drm_vblank.h>
>
>  #include "pl111_drm.h"
>
> diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
> index b2c5e9f34051..77d2da9a8a7c 100644
> --- a/drivers/gpu/drm/pl111/pl111_drm.h
> +++ b/drivers/gpu/drm/pl111/pl111_drm.h
> @@ -13,14 +13,15 @@
>  #ifndef _PL111_DRM_H_
>  #define _PL111_DRM_H_
>
> -#include <drm/drm_gem.h>
> -#include <drm/drm_simple_kms_helper.h>
> +#include <linux/clk-provider.h>
> +#include <linux/interrupt.h>
> +
> +#include <drm/drm_bridge.h>
>  #include <drm/drm_connector.h>
>  #include <drm/drm_encoder.h>
> +#include <drm/drm_gem.h>
>  #include <drm/drm_panel.h>
> -#include <drm/drm_bridge.h>
> -#include <linux/clk-provider.h>
> -#include <linux/interrupt.h>
> +#include <drm/drm_simple_kms_helper.h>
>
>  #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)
>
> diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
> index 90fa99a7dfa9..276b53473a84 100644
> --- a/drivers/gpu/drm/pl111/pl111_drv.c
> +++ b/drivers/gpu/drm/pl111/pl111_drv.c
> @@ -48,18 +48,18 @@
>
>  #include <linux/amba/bus.h>
>  #include <linux/amba/clcd-regs.h>
> -#include <linux/version.h>
> -#include <linux/shmem_fs.h>
>  #include <linux/dma-buf.h>
>  #include <linux/module.h>
> -#include <linux/slab.h>
>  #include <linux/of.h>
>  #include <linux/of_graph.h>
>  #include <linux/of_reserved_mem.h>
> +#include <linux/shmem_fs.h>
> +#include <linux/slab.h>
> +#include <linux/version.h>
>
> -#include <drm/drmP.h>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_bridge.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>
> @@ -67,6 +67,7 @@
>  #include <drm/drm_of.h>
>  #include <drm/drm_panel.h>
>  #include <drm/drm_probe_helper.h>
> +#include <drm/drm_vblank.h>
>
>  #include "pl111_drm.h"
>  #include "pl111_versatile.h"
> diff --git a/drivers/gpu/drm/pl111/pl111_nomadik.h b/drivers/gpu/drm/pl111/pl111_nomadik.h
> index 19d663d46353..47ccf5c839fc 100644
> --- a/drivers/gpu/drm/pl111/pl111_nomadik.h
> +++ b/drivers/gpu/drm/pl111/pl111_nomadik.h
> @@ -1,10 +1,11 @@
>  // SPDX-License-Identifier: GPL-2.0+
> -#include <linux/device.h>
>
>  #ifndef PL111_NOMADIK_H
>  #define PL111_NOMADIK_H
>  #endif
>
> +struct device;
> +
>  #ifdef CONFIG_ARCH_NOMADIK
>
>  void pl111_nomadik_init(struct device *dev);
> diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
> index 38f4ee05285e..09aeaffb7660 100644
> --- a/drivers/gpu/drm/pl111/pl111_versatile.c
> +++ b/drivers/gpu/drm/pl111/pl111_versatile.c
> @@ -1,13 +1,14 @@
>  // SPDX-License-Identifier: GPL-2.0-only
> +
>  #include <linux/amba/clcd-regs.h>
> +#include <linux/bitops.h>
>  #include <linux/device.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
>  #include <linux/regmap.h>
> -#include <linux/mfd/syscon.h>
> -#include <linux/bitops.h>
> -#include <linux/module.h>
> -#include <drm/drmP.h>
> +
>  #include "pl111_versatile.h"
>  #include "pl111_vexpress.h"
>  #include "pl111_drm.h"
> diff --git a/drivers/gpu/drm/pl111/pl111_versatile.h b/drivers/gpu/drm/pl111/pl111_versatile.h
> index 41aa6d969dc6..143877010042 100644
> --- a/drivers/gpu/drm/pl111/pl111_versatile.h
> +++ b/drivers/gpu/drm/pl111/pl111_versatile.h
> @@ -4,6 +4,9 @@
>  #ifndef PL111_VERSATILE_H
>  #define PL111_VERSATILE_H
>
> +struct device;
> +struct pl111_drm_dev_private;
> +
>  int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv);
>
>  #endif
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 04/19] drm/zte: drop use of drmP.h
       [not found] ` <20190716064220.18157-5-sam@ravnborg.org>
@ 2019-07-16 14:06   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:06 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: David Airlie, Shawn Guo, Maling list - DRI developers, 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 file.
> Fix fallout.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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 ++++-
>  6 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c
> index ef019cad7e81..7caccb6b702d 100644
> --- a/drivers/gpu/drm/zte/zx_drm_drv.c
> +++ b/drivers/gpu/drm/zte/zx_drm_drv.c
> @@ -18,13 +18,14 @@
>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_crtc.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_gem_framebuffer_helper.h>
>  #include <drm/drm_of.h>
>  #include <drm/drm_probe_helper.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_vblank.h>
>
>  #include "zx_drm_drv.h"
>  #include "zx_vou.h"
> diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> index df522d74bebf..2a3413a1d0db 100644
> --- a/drivers/gpu/drm/zte/zx_hdmi.c
> +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> @@ -23,7 +23,7 @@
>  #include <drm/drm_edid.h>
>  #include <drm/drm_of.h>
>  #include <drm/drm_probe_helper.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_print.h>
>
>  #include <sound/hdmi-codec.h>
>
> diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c
> index 706452f9b276..f1d7d04b853c 100644
> --- a/drivers/gpu/drm/zte/zx_plane.c
> +++ b/drivers/gpu/drm/zte/zx_plane.c
> @@ -11,10 +11,10 @@
>  #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_modeset_helper_vtables.h>
>  #include <drm/drm_plane_helper.h>
> -#include <drm/drmP.h>
>
>  #include "zx_common_regs.h"
>  #include "zx_drm_drv.h"
> diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
> index 87b5d86413d2..b404a1c799b2 100644
> --- a/drivers/gpu/drm/zte/zx_tvenc.c
> +++ b/drivers/gpu/drm/zte/zx_tvenc.c
> @@ -11,11 +11,13 @@
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
>  #include <linux/regmap.h>
>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_print.h>
>  #include <drm/drm_probe_helper.h>
> -#include <drm/drmP.h>
>
>  #include "zx_drm_drv.h"
>  #include "zx_tvenc_regs.h"
> diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> index e14c1d709740..6b718593e37d 100644
> --- a/drivers/gpu/drm/zte/zx_vga.c
> +++ b/drivers/gpu/drm/zte/zx_vga.c
> @@ -10,11 +10,13 @@
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
>  #include <linux/regmap.h>
>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_print.h>
>  #include <drm/drm_probe_helper.h>
> -#include <drm/drmP.h>
>
>  #include "zx_drm_drv.h"
>  #include "zx_vga_regs.h"
> diff --git a/drivers/gpu/drm/zte/zx_vou.c b/drivers/gpu/drm/zte/zx_vou.c
> index 15400ffb1d22..752635bec4e2 100644
> --- a/drivers/gpu/drm/zte/zx_vou.c
> +++ b/drivers/gpu/drm/zte/zx_vou.c
> @@ -10,7 +10,10 @@
>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/module.h>
>  #include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +
>  #include <video/videomode.h>
>
>  #include <drm/drm_atomic_helper.h>
> @@ -21,7 +24,7 @@
>  #include <drm/drm_of.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_probe_helper.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_vblank.h>
>
>  #include "zx_common_regs.h"
>  #include "zx_drm_drv.h"
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 06/19] drm/vc4: drop use of drmP.h
       [not found] ` <20190716064220.18157-7-sam@ravnborg.org>
@ 2019-07-16 14:07   ` Alex Deucher
  0 siblings, 0 replies; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:07 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Maling list - DRI developers, Emil Velikov

On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Drop use of the deprecated header drmP.h.
> Fix so vc4_drv.h is now self-contained, and fixed fall-out in remaining
> files.
>
> Divided include files in blocks.
> Sorted include files within their blocks.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Eric Anholt <eric@anholt.net>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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 ++++
>  11 files changed, 60 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 5e09389e1514..c3a520a04efd 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -32,15 +32,18 @@
>   * ones that set the clock.
>   */
>
> +#include <linux/clk.h>
> +#include <linux/component.h>
> +#include <linux/of_device.h>
> +
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_atomic_uapi.h>
> +#include <drm/drm_fb_cma_helper.h>
>  #include <drm/drm_print.h>
>  #include <drm/drm_probe_helper.h>
> -#include <linux/clk.h>
> -#include <drm/drm_fb_cma_helper.h>
> -#include <linux/component.h>
> -#include <linux/of_device.h>
> +#include <drm/drm_vblank.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_debugfs.c b/drivers/gpu/drm/vc4/vc4_debugfs.c
> index f9b46911fa50..48d1e443c426 100644
> --- a/drivers/gpu/drm/vc4/vc4_debugfs.c
> +++ b/drivers/gpu/drm/vc4/vc4_debugfs.c
> @@ -10,7 +10,6 @@
>  #include <linux/circ_buf.h>
>  #include <linux/ctype.h>
>  #include <linux/debugfs.h>
> -#include <drm/drmP.h>
>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> index a295aa91d3c5..634fa269c6ac 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.c
> +++ b/drivers/gpu/drm/vc4/vc4_drv.c
> @@ -26,16 +26,21 @@
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/device.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/io.h>
>  #include <linux/module.h>
>  #include <linux/of_platform.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.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_atomic_helper.h>
> +#include <drm/drm_vblank.h>
>
>  #include "uapi/drm/vc4_drm.h"
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index efd1ec3430f5..7bf58254ff30 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -6,16 +6,23 @@
>   * published by the Free Software Foundation.
>   */
>
> -#include <linux/mm_types.h>
> -#include <drm/drmP.h>
> -#include <drm/drm_util.h>
> +#include <linux/delay.h>
> +#include <linux/refcount.h>
> +#include <linux/uaccess.h>
> +
> +#include <drm/drm_atomic.h>
> +#include <drm/drm_debugfs.h>
> +#include <drm/drm_device.h>
>  #include <drm/drm_encoder.h>
>  #include <drm/drm_gem_cma_helper.h>
> -#include <drm/drm_atomic.h>
> -#include <drm/drm_syncobj.h>
> +#include <drm/drm_mm.h>
> +#include <drm/drm_modeset_lock.h>
>
>  #include "uapi/drm/vc4_drm.h"
>
> +struct drm_device;
> +struct drm_gem_object;
> +
>  /* Don't forget to update vc4_bo.c: bo_type_names[] when adding to
>   * this.
>   */
> diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
> index 2ea4e20b7b8a..21a51cc6cfe6 100644
> --- a/drivers/gpu/drm/vc4/vc4_dsi.c
> +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
> @@ -29,22 +29,25 @@
>   * hopefully present.
>   */
>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_edid.h>
> -#include <drm/drm_mipi_dsi.h>
> -#include <drm/drm_of.h>
> -#include <drm/drm_panel.h>
> -#include <drm/drm_probe_helper.h>
> -#include <linux/clk.h>
>  #include <linux/clk-provider.h>
> +#include <linux/clk.h>
>  #include <linux/completion.h>
>  #include <linux/component.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/dmaengine.h>
>  #include <linux/i2c.h>
>  #include <linux/io.h>
>  #include <linux/of_address.h>
>  #include <linux/of_platform.h>
>  #include <linux/pm_runtime.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_probe_helper.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
> index 84795d928f20..b72b760e3018 100644
> --- a/drivers/gpu/drm/vc4/vc4_gem.c
> +++ b/drivers/gpu/drm/vc4/vc4_gem.c
> @@ -29,6 +29,8 @@
>  #include <linux/sched/signal.h>
>  #include <linux/dma-fence-array.h>
>
> +#include <drm/drm_syncobj.h>
> +
>  #include "uapi/drm/vc4_drm.h"
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
> diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
> index f746e9a7a88c..0612c4cd692d 100644
> --- a/drivers/gpu/drm/vc4/vc4_hvs.c
> +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
> @@ -22,8 +22,11 @@
>   * each CRTC.
>   */
>
> -#include <drm/drm_atomic_helper.h>
>  #include <linux/component.h>
> +#include <linux/platform_device.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
> index 295dacc8bcb9..1e285bf42602 100644
> --- a/drivers/gpu/drm/vc4/vc4_kms.c
> +++ b/drivers/gpu/drm/vc4/vc4_kms.c
> @@ -14,12 +14,14 @@
>   * crtc, HDMI encoder).
>   */
>
> -#include <drm/drm_crtc.h>
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.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>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index 9553430e6e53..a31d9722e3f0 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -20,12 +20,14 @@
>
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
> -#include <drm/drm_fb_cma_helper.h>
> -#include <drm/drm_plane_helper.h>
>  #include <drm/drm_atomic_uapi.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_fourcc.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
> +#include <drm/drm_plane_helper.h>
>
>  #include "uapi/drm/vc4_drm.h"
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
> index 96f91c1b4b6e..1ce4d7142b6e 100644
> --- a/drivers/gpu/drm/vc4/vc4_txp.c
> +++ b/drivers/gpu/drm/vc4/vc4_txp.c
> @@ -7,18 +7,20 @@
>   *     Boris Brezillon <boris.brezillon@bootlin.com>
>   */
>
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_fb_cma_helper.h>
> -#include <drm/drm_edid.h>
> -#include <drm/drm_panel.h>
> -#include <drm/drm_probe_helper.h>
> -#include <drm/drm_writeback.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/of_graph.h>
>  #include <linux/of_platform.h>
>  #include <linux/pm_runtime.h>
>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_probe_helper.h>
> +#include <drm/drm_writeback.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
> index 0533646a4d13..0e78d0d31d5c 100644
> --- a/drivers/gpu/drm/vc4/vc4_v3d.c
> +++ b/drivers/gpu/drm/vc4/vc4_v3d.c
> @@ -18,7 +18,11 @@
>
>  #include <linux/clk.h>
>  #include <linux/component.h>
> +#include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
> +
> +#include <drm/drm_irq.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 08/19] drm/udl: drop use of drmP.h
       [not found] ` <20190716064220.18157-9-sam@ravnborg.org>
@ 2019-07-16 14:07   ` Alex Deucher
  2019-07-16 16:36     ` Sam Ravnborg
  0 siblings, 1 reply; 45+ messages in thread
From: Alex Deucher @ 2019-07-16 14:07 UTC (permalink / raw)
  To: Sam Ravnborg
  Cc: Robert Tarasov, Emil Lundmark, Oleksandr Andrushchenko,
	David Airlie, Sean Paul, Maling list - DRI developers,
	Jani Nikula, Mikulas Patocka, Thomas Zimmermann, Alex Deucher,
	Eugeniy Paltsev, Emil Velikov

On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> The drmP.h header file is deprecated.
> Drop it from all files in the udl driver.
>
> Made the header files self contained, which then
> made it simpler to update the .c files.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Robert Tarasov <tutankhamen@chromium.org>
> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: "Noralf Trønnes" <noralf@tronnes.org>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Mikulas Patocka <mpatocka@redhat.com>
> Cc: Emil Lundmark <lndmrk@chromium.org>
> Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  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 ----
>  11 files changed, 43 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index 921561875d7f..ddb61a60c610 100644
> --- a/drivers/gpu/drm/udl/udl_connector.c
> +++ b/drivers/gpu/drm/udl/udl_connector.c
> @@ -7,11 +7,9 @@
>   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
>   */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_edid.h>
>  #include <drm/drm_crtc_helper.h>
>  #include <drm/drm_probe_helper.h>
> +
>  #include "udl_connector.h"
>  #include "udl_drv.h"
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.h b/drivers/gpu/drm/udl/udl_connector.h
> index 0fb0db5c4612..7f2d392df173 100644
> --- a/drivers/gpu/drm/udl/udl_connector.h
> +++ b/drivers/gpu/drm/udl/udl_connector.h
> @@ -3,6 +3,8 @@
>
>  #include <drm/drm_crtc.h>
>
> +struct edid;
> +
>  struct udl_drm_connector {
>         struct drm_connector connector;
>         /* last udl_detect edid */
> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
> index 10a60e7e93d6..3108e9a9234b 100644
> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
> @@ -5,11 +5,13 @@
>   * Copyright (c) 2014 The Chromium OS Authors
>   */
>
> -#include <drm/drmP.h>
> -#include "udl_drv.h"
>  #include <linux/shmem_fs.h>
>  #include <linux/dma-buf.h>
>
> +#include <drm/drm_prime.h>
> +
> +#include "udl_drv.h"
> +
>  struct udl_drm_dmabuf_attachment {
>         struct sg_table sgt;
>         enum dma_data_direction dir;
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index ae53bf75c1d6..8426669433e4 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -4,9 +4,14 @@
>   */
>
>  #include <linux/module.h>
> -#include <drm/drmP.h>
> +
>  #include <drm/drm_crtc_helper.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_ioctl.h>
>  #include <drm/drm_probe_helper.h>
> +#include <drm/drm_print.h>
> +
>  #include "udl_drv.h"
>
>  static int udl_usb_suspend(struct usb_interface *interface,
> diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
> index 9d0790be544f..12a970fd9a87 100644
> --- a/drivers/gpu/drm/udl/udl_drv.h
> +++ b/drivers/gpu/drm/udl/udl_drv.h
> @@ -11,9 +11,15 @@
>  #ifndef UDL_DRV_H
>  #define UDL_DRV_H
>
> +#include <linux/mm_types.h>
>  #include <linux/usb.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_framebuffer.h>
>  #include <drm/drm_gem.h>
> -#include <linux/mm_types.h>
> +
> +struct drm_encoder;
> +struct drm_mode_create_dumb;
>
>  #define DRIVER_NAME            "udl"
>  #define DRIVER_DESC            "DisplayLink"
> diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c
> index f87989e6ee51..203f041e737c 100644
> --- a/drivers/gpu/drm/udl/udl_encoder.c
> +++ b/drivers/gpu/drm/udl/udl_encoder.c
> @@ -7,9 +7,9 @@
>   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
>   */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
> -#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_encoder.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +
>  #include "udl_drv.h"
>
>  /* dummy encoder */
> diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
> index e1116bf7b9d7..ef3504d06343 100644
> --- a/drivers/gpu/drm/udl/udl_fb.c
> +++ b/drivers/gpu/drm/udl/udl_fb.c
> @@ -7,18 +7,17 @@
>   * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>
>   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
>   */
> -#include <linux/module.h>
> -#include <linux/slab.h>
> -#include <linux/fb.h>
> +
> +#include <linux/moduleparam.h>
>  #include <linux/dma-buf.h>
> -#include <linux/mem_encrypt.h>
>
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
>  #include <drm/drm_crtc_helper.h>
> -#include "udl_drv.h"
> -
> +#include <drm/drm_drv.h>
>  #include <drm/drm_fb_helper.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_modeset_helper.h>
> +
> +#include "udl_drv.h"
>
>  #define DL_DEFIO_WRITE_DELAY    (HZ/20) /* fb_deferred_io.delay in jiffies */
>
> diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
> index c6ca2c09bc97..b23a5c2fcd80 100644
> --- a/drivers/gpu/drm/udl/udl_gem.c
> +++ b/drivers/gpu/drm/udl/udl_gem.c
> @@ -3,10 +3,13 @@
>   * Copyright (C) 2012 Red Hat
>   */
>
> -#include <drm/drmP.h>
> -#include "udl_drv.h"
> -#include <linux/shmem_fs.h>
>  #include <linux/dma-buf.h>
> +#include <linux/vmalloc.h>
> +
> +#include <drm/drm_mode.h>
> +#include <drm/drm_prime.h>
> +
> +#include "udl_drv.h"
>
>  struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev,
>                                             size_t size)
> diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
> index 1a99c7647444..4e854e017390 100644
> --- a/drivers/gpu/drm/udl/udl_main.c
> +++ b/drivers/gpu/drm/udl/udl_main.c
> @@ -7,9 +7,11 @@
>   * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>
>   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
>   */
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc_helper.h>
> +
> +#include <drm/drm.h>
> +#include <drm/drm_print.h>
>  #include <drm/drm_probe_helper.h>
> +
>  #include "udl_drv.h"
>
>  /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */
> diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
> index 793722d0c8cd..bc1ab6060dc6 100644
> --- a/drivers/gpu/drm/udl/udl_modeset.c
> +++ b/drivers/gpu/drm/udl/udl_modeset.c
> @@ -9,10 +9,10 @@
>
>   */
>
> -#include <drm/drmP.h>
> -#include <drm/drm_crtc.h>
>  #include <drm/drm_crtc_helper.h>
> -#include <drm/drm_plane_helper.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +#include <drm/drm_vblank.h>
> +
>  #include "udl_drv.h"
>
>  /*
> diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
> index 6837f592f6ba..1973a4c1e358 100644
> --- a/drivers/gpu/drm/udl/udl_transfer.c
> +++ b/drivers/gpu/drm/udl/udl_transfer.c
> @@ -7,12 +7,8 @@
>   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
>   */
>
> -#include <linux/module.h>
> -#include <linux/slab.h>
> -#include <linux/fb.h>
>  #include <asm/unaligned.h>
>
> -#include <drm/drmP.h>
>  #include "udl_drv.h"
>
>  #define MAX_CMD_PIXELS         255
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 08/19] drm/udl: drop use of drmP.h
  2019-07-16 14:07   ` [PATCH v2 08/19] drm/udl: " Alex Deucher
@ 2019-07-16 16:36     ` Sam Ravnborg
  0 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-16 16:36 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Robert Tarasov, Emil Lundmark, Oleksandr Andrushchenko,
	David Airlie, Sean Paul, Maling list - DRI developers,
	Jani Nikula, Mikulas Patocka, Thomas Zimmermann, Alex Deucher,
	Eugeniy Paltsev, Emil Velikov

Hi Alex.

> >
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > Acked-by: Emil Velikov <emil.velikov@collabora.com>
> > Cc: Sean Paul <sean@poorly.run>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Robert Tarasov <tutankhamen@chromium.org>
> > Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: "Noralf Trønnes" <noralf@tronnes.org>
> > Cc: Eric Anholt <eric@anholt.net>
> > Cc: Mikulas Patocka <mpatocka@redhat.com>
> > Cc: Emil Lundmark <lndmrk@chromium.org>
> > Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> 
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Thanks for all your reviews - appreciated!

	Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
  2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
                   ` (17 preceding siblings ...)
       [not found] ` <20190716064220.18157-9-sam@ravnborg.org>
@ 2019-07-16 17:03 ` Eric Anholt
  18 siblings, 0 replies; 45+ messages in thread
From: Eric Anholt @ 2019-07-16 17:03 UTC (permalink / raw)
  To: Sam Ravnborg, dri-devel


[-- Attachment #1.1: Type: text/plain, Size: 293 bytes --]

Sam Ravnborg <sam@ravnborg.org> writes:

> 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.

For v3d, vc4, pl111:

Reviewed-by: Eric Anholt <eric@anholt.net>

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
  2019-07-16  6:50   ` Sam Ravnborg
  (?)
@ 2019-07-17 10:59     ` Sam Ravnborg
  -1 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-17 10:59 UTC (permalink / raw)
  To: dri-devel
  Cc: Maxime Jourdan, Neil Armstrong, David Airlie,
	Alexandru-Cosmin Gheorghe, Jerome Brunet, Deepak Sharma,
	Oleksandr Andrushchenko, Kevin Hilman, Maxime Ripard,
	Chen-Yu Tsai, Tomi Valkeinen, NXP Linux Team, linux-rockchip,
	Eugeniy Paltsev, Dan Carpenter, Robert Tarasov, Emil Lundmark,
	Jani Nikula, Jyri Sarha, linux-mediatek, Matthias Brugger,
	linux-amlogic

On Tue, Jul 16, 2019 at 08:50:22AM +0200, Sam Ravnborg wrote:
> Copied all recipients on the cover letter.
> As the list is long this mail may not hit the mailing lists.
> 
> 	Sam
> 
> On Tue, Jul 16, 2019 at 08:42:01AM +0200, Sam Ravnborg wrote:
> > This patch set removes a far share of the remaining uses of drmP.h.
> > Common for all patches are that the respective files are maintained
> > in drm-misc.
> > All patches are independent.
> > 
> > Patches have all been build tested with various configs and various
> > architectures.
> > There are likely introduced a few build issues that randconfig
> > build will reveal, but for all configs I have used the build was OK.
> > 
> > This patchset does not conclude the quest to kill all uses
> > of drmP.h, but it is a major step towards the goal.
> > 
> > Please review/ack.
> > I plan to apply the patches to drm-misc, but feel free
> > to do it yourself.
> > 
> > There will be conflicts with the ongoing work on ttm, gem etc.
> > But let's deal with the conflicts when they hit us - it
> > is simple conflicts in the list of include files.
> > 
> > v2:
> > - Removed merged patches
> > - Added ack from Emil Velikov to the full series
> > - Rebased on top of drm-misc-next
> > - Hand-edited the list of Cc: as get_maintainer.pl in some
> >   cases looks up too much people, due to cross kernel commits

I have collected the additional r-bs and acks and pushed out the full
series. Thanks for feedback to everyone!

	Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
@ 2019-07-17 10:59     ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc
@ 2019-07-17 10:59     ` Sam Ravnborg
  0 siblings, 0 replies; 45+ 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] 45+ messages in thread
* Re: [PATCH v2 14/19] drm/tilcdc: drop use of drmP.h
  2019-07-16  6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
@ 2019-07-30  6:03   ` Jyri Sarha
  2019-07-30  6:39     ` Sam Ravnborg
  0 siblings, 1 reply; 45+ messages in thread
From: Jyri Sarha @ 2019-07-30  6:03 UTC (permalink / raw)
  To: Sam Ravnborg, dri-devel; +Cc: David Airlie, Tomi Valkeinen, Emil Velikov

On 16/07/2019 09:42, Sam Ravnborg wrote:
> Dropped drmP.h and all other header files not used by tilcdc_drv.h.
> Added the minimal includes and forwards to make the header file
> self-contained.
> 
> Then dropped the remaining uses of drmP.h and fixed all fall-out.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov@collabora.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Acked-by: Jyri Sarha <jsarha@ti.com>

> ---
>  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 +++---
>  7 files changed, 57 insertions(+), 35 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> index 1067e702c22c..8c2025780372 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> @@ -15,16 +15,20 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> +#include <linux/delay.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/of_graph.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_crtc.h>
> -#include <drm/drm_flip_work.h>
> -#include <drm/drm_plane_helper.h>
> -#include <linux/workqueue.h>
> -#include <linux/completion.h>
> -#include <linux/dma-mapping.h>
> -#include <linux/of_graph.h>
> -#include <linux/math64.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_gem_cma_helper.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_vblank.h>
>  
>  #include "tilcdc_drv.h"
>  #include "tilcdc_regs.h"
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> index b6b71e86e238..8e228c75b68e 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> @@ -18,19 +18,30 @@
>  /* LCDC DRM driver, based on da8xx-fb */
>  
>  #include <linux/component.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
>  #include <linux/pinctrl/consumer.h>
> -#include <linux/suspend.h>
> -#include <drm/drm_atomic.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_debugfs.h>
> +#include <drm/drm_drv.h>
>  #include <drm/drm_fb_helper.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_gem_cma_helper.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
> +#include <drm/drm_irq.h>
> +#include <drm/drm_mm.h>
>  #include <drm/drm_probe_helper.h>
> +#include <drm/drm_vblank.h>
> +
>  
>  #include "tilcdc_drv.h"
> +#include "tilcdc_external.h"
> +#include "tilcdc_panel.h"
>  #include "tilcdc_regs.h"
>  #include "tilcdc_tfp410.h"
> -#include "tilcdc_panel.h"
> -#include "tilcdc_external.h"
>  
>  static LIST_HEAD(module_list);
>  
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
> index d86397da12a9..50c208c48be0 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
> @@ -18,21 +18,24 @@
>  #ifndef __TILCDC_DRV_H__
>  #define __TILCDC_DRV_H__
>  
> -#include <linux/clk.h>
>  #include <linux/cpufreq.h>
> -#include <linux/module.h>
> -#include <linux/platform_device.h>
> -#include <linux/pm.h>
> -#include <linux/pm_runtime.h>
> -#include <linux/slab.h>
> -#include <linux/of.h>
> -#include <linux/of_device.h>
> -#include <linux/list.h>
> -
> -#include <drm/drmP.h>
> -#include <drm/drm_bridge.h>
> -#include <drm/drm_fb_cma_helper.h>
> -#include <drm/drm_gem_cma_helper.h>
> +#include <linux/irqreturn.h>
> +
> +#include <drm/drm_print.h>
> +
> +struct clk;
> +struct workqueue_struct;
> +
> +struct drm_connector;
> +struct drm_connector_helper_funcs;
> +struct drm_crtc;
> +struct drm_device;
> +struct drm_display_mode;
> +struct drm_encoder;
> +struct drm_framebuffer;
> +struct drm_minor;
> +struct drm_pending_vblank_event;
> +struct drm_plane;
>  
>  /* Defaulting to pixel clock defined on AM335x */
>  #define TILCDC_DEFAULT_MAX_PIXELCLOCK  126000
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c
> index e9969cd36610..0f3419a19d71 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c
> @@ -10,6 +10,7 @@
>  
>  #include <linux/component.h>
>  #include <linux/of_graph.h>
> +
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_of.h>
>  
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> index 5d532a596e1e..e1c39712b67a 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> @@ -15,14 +15,17 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include <linux/pinctrl/pinmux.h>
> -#include <linux/pinctrl/consumer.h>
> -#include <linux/backlight.h>
>  #include <linux/gpio/consumer.h>
> +#include <linux/pinctrl/consumer.h>
> +#include <linux/platform_device.h>
> +
>  #include <video/display_timing.h>
>  #include <video/of_display_timing.h>
>  #include <video/videomode.h>
> -#include <drm/drm_atomic_helper.h>
> +
> +#include <drm/drm_atomic_state_helper.h>
> +#include <drm/drm_connector.h>
> +#include <drm/drm_modeset_helper_vtables.h>
>  #include <drm/drm_probe_helper.h>
>  
>  #include "tilcdc_drv.h"
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
> index 7667b038ae7f..347ca8656aef 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
> @@ -15,12 +15,10 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include <drm/drmP.h>
> -
>  #include <drm/drm_atomic.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_atomic_helper.h>
> -#include <uapi/drm/drm_fourcc.h>
> +#include <drm/drm_fourcc.h>
>  
>  #include "tilcdc_drv.h"
>  
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> index fe59fbfdde69..da642c725cd6 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> @@ -15,12 +15,14 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include <linux/i2c.h>
>  #include <linux/gpio.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/of_gpio.h>
> -#include <linux/pinctrl/pinmux.h>
> -#include <linux/pinctrl/consumer.h>
> +#include <linux/platform_device.h>
> +
>  #include <drm/drm_atomic_helper.h>
> +#include <drm/drm_encoder.h>
> +#include <drm/drm_modeset_helper_vtables.h>
>  #include <drm/drm_probe_helper.h>
>  
>  #include "tilcdc_drv.h"
> 


-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
* Re: [PATCH v2 14/19] drm/tilcdc: drop use of drmP.h
  2019-07-30  6:03   ` Jyri Sarha
@ 2019-07-30  6:39     ` Sam Ravnborg
  0 siblings, 0 replies; 45+ messages in thread
From: Sam Ravnborg @ 2019-07-30  6:39 UTC (permalink / raw)
  To: Jyri Sarha; +Cc: David Airlie, Tomi Valkeinen, dri-devel, Emil Velikov

Hi Jyri.

On Tue, Jul 30, 2019 at 09:03:11AM +0300, Jyri Sarha wrote:
> On 16/07/2019 09:42, Sam Ravnborg wrote:
> > Dropped drmP.h and all other header files not used by tilcdc_drv.h.
> > Added the minimal includes and forwards to make the header file
> > self-contained.
> > 
> > Then dropped the remaining uses of drmP.h and fixed all fall-out.
> > 
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > Acked-by: Emil Velikov <emil.velikov@collabora.com>
> > Cc: Jyri Sarha <jsarha@ti.com>
> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> 
> Acked-by: Jyri Sarha <jsarha@ti.com>
Thanks. Patch is already applied so too late to add your ack to the
changelog.

	Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 45+ messages in thread
end of thread, other threads:[~2019-07-30  6:40 UTC | newest]

Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
2019-07-16  6:42   ` Sam Ravnborg
2019-07-16  6:42   ` Sam Ravnborg
2019-07-16 14:03   ` Alex Deucher
2019-07-16 14:03     ` Alex Deucher
2019-07-16 14:03     ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
2019-07-16 14:06   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
2019-07-16 14:06   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 05/19] drm/sun4i: " Sam Ravnborg
2019-07-16  8:28   ` Maxime Ripard
2019-07-16  8:28     ` Maxime Ripard
2019-07-16  6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
2019-07-16 14:01   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 09/19] drm/omapdrm: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
2019-07-16 14:02   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 11/19] drm/tdfx: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 13/19] drm/i810: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
2019-07-30  6:03   ` Jyri Sarha
2019-07-30  6:39     ` Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 15/19] drm/i2c/ch7006: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 17/19] drm/imx: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 18/19] drm/rockchip: " Sam Ravnborg
2019-07-16  6:42   ` Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 19/19] drm/mediatek: " Sam Ravnborg
2019-07-16  6:42   ` Sam Ravnborg
2019-07-16  7:44   ` CK Hu
2019-07-16  7:44     ` CK Hu
2019-07-16 14:02   ` Alex Deucher
2019-07-16 14:02     ` Alex Deucher
2019-07-16  6:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-16  6:50   ` Sam Ravnborg
2019-07-16  6:50   ` Sam Ravnborg
2019-07-17 10:59   ` Sam Ravnborg
2019-07-17 10:59     ` Sam Ravnborg
2019-07-17 10:59     ` Sam Ravnborg
     [not found] ` <20190716064220.18157-5-sam@ravnborg.org>
2019-07-16 14:06   ` [PATCH v2 04/19] drm/zte: drop use of drmP.h Alex Deucher
     [not found] ` <20190716064220.18157-7-sam@ravnborg.org>
2019-07-16 14:07   ` [PATCH v2 06/19] drm/vc4: " Alex Deucher
     [not found] ` <20190716064220.18157-9-sam@ravnborg.org>
2019-07-16 14:07   ` [PATCH v2 08/19] drm/udl: " Alex Deucher
2019-07-16 16:36     ` Sam Ravnborg
2019-07-16 17:03 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Eric Anholt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.