[PATCH v2 04/19] drm/zte: drop use of drmP.h

[Alex Deucher]

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

Reviewed-by: Alex Deucher <alexander.deucher at 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 at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel