[PATCH v2 06/19] drm/vc4: drop use of drmP.h
Alex Deucher
alexdeucher at gmail.com
Tue Jul 16 14:07:16 UTC 2019
On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam at 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 at ravnborg.org>
> Acked-by: Emil Velikov <emil.velikov at collabora.com>
> Cc: Eric Anholt <eric at anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher at 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 at 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 at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list