From: Alex Deucher <alexdeucher@gmail.com>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Robert Tarasov <tutankhamen@chromium.org>,
Emil Lundmark <lndmrk@chromium.org>,
Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>,
David Airlie <airlied@linux.ie>, Sean Paul <sean@poorly.run>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
Jani Nikula <jani.nikula@intel.com>,
Mikulas Patocka <mpatocka@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Alex Deucher <alexander.deucher@amd.com>,
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Emil Velikov <emil.velikov@collabora.com>
Subject: Re: [PATCH v2 08/19] drm/udl: drop use of drmP.h
Date: Tue, 16 Jul 2019 10:07:59 -0400 [thread overview]
Message-ID: <CADnq5_M=fZUarEA9VanryORZkwc6YnEwZpKDHMqpU2o9CYTa=Q@mail.gmail.com> (raw)
In-Reply-To: <20190716064220.18157-9-sam@ravnborg.org>
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
next prev parent reply other threads:[~2019-07-16 14:08 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Alex Deucher [this message]
2019-07-16 16:36 ` [PATCH v2 08/19] drm/udl: " Sam Ravnborg
2019-07-16 17:03 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Eric Anholt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_M=fZUarEA9VanryORZkwc6YnEwZpKDHMqpU2o9CYTa=Q@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=jani.nikula@intel.com \
--cc=lndmrk@chromium.org \
--cc=mpatocka@redhat.com \
--cc=oleksandr_andrushchenko@epam.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=tutankhamen@chromium.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.