From: Sam Ravnborg <sam@ravnborg.org> To: dri-devel@lists.freedesktop.org Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>, Boris Brezillon <bbrezillon@kernel.org>, David Airlie <airlied@linux.ie>, Ludovic Desroches <ludovic.desroches@microchip.com>, Daniel Vetter <daniel@ffwll.ch>, Sam Ravnborg <sam@ravnborg.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 14/33] drm/atmel_hlcdc: drop use of drmP.h Date: Sun, 30 Jun 2019 08:19:03 +0200 [thread overview] Message-ID: <20190630061922.7254-15-sam@ravnborg.org> (raw) In-Reply-To: <20190630061922.7254-1-sam@ravnborg.org> Drop use of the deprecated header drmP.h. Make header file self-contained, with only the required set of include files. And fixed fallout in remaining files. Divide include files in blocks and sort them within each block. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +++++++---- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 12 +++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +++---------------- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 ++- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++++++++ 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 81c50772df05..edcd0042bc9c 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -19,15 +19,19 @@ */ #include <linux/clk.h> +#include <linux/mfd/atmel-hlcdc.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm.h> #include <linux/pm_runtime.h> -#include <linux/pinctrl/consumer.h> +#include <video/videomode.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> - -#include <video/videomode.h> +#include <drm/drm_vblank.h> #include "atmel_hlcdc_dc.h" diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 2b794a50e7ab..891708048c8f 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -22,8 +22,20 @@ #include <linux/clk.h> #include <linux/irq.h> #include <linux/irqchip.h> +#include <linux/mfd/atmel-hlcdc.h> #include <linux/module.h> #include <linux/pm_runtime.h> +#include <linux/platform_device.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_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_irq.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "atmel_hlcdc_dc.h" diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h index 0155efb9c443..b56c399f8715 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h @@ -22,23 +22,9 @@ #ifndef DRM_ATMEL_HLCDC_H #define DRM_ATMEL_HLCDC_H -#include <linux/clk.h> -#include <linux/dmapool.h> -#include <linux/irqdomain.h> -#include <linux/mfd/atmel-hlcdc.h> -#include <linux/pwm.h> - -#include <drm/drm_atomic.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_gem_cma_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_panel.h> -#include <drm/drm_plane_helper.h> -#include <drm/drmP.h> +#include <linux/regmap.h> + +#include <drm/drm_plane.h> #define ATMEL_HLCDC_LAYER_CHER 0x0 #define ATMEL_HLCDC_LAYER_CHDR 0x4 diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c index f73d8a92274e..24938bd5adf6 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c @@ -19,9 +19,10 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/media-bus-format.h> #include <linux/of_graph.h> -#include <drm/drmP.h> +#include <drm/drm_encoder.h> #include <drm/drm_of.h> #include <drm/drm_bridge.h> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index 0ee5b7a3a4b0..e66ea9f32185 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -17,6 +17,16 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dmapool.h> +#include <linux/mfd/atmel-hlcdc.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_plane_helper.h> + #include "atmel_hlcdc_dc.h" /** -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org> To: dri-devel@lists.freedesktop.org Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>, Boris Brezillon <bbrezillon@kernel.org>, David Airlie <airlied@linux.ie>, Nicolas Ferre <nicolas.ferre@microchip.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, Sam Ravnborg <sam@ravnborg.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 14/33] drm/atmel_hlcdc: drop use of drmP.h Date: Sun, 30 Jun 2019 08:19:03 +0200 [thread overview] Message-ID: <20190630061922.7254-15-sam@ravnborg.org> (raw) In-Reply-To: <20190630061922.7254-1-sam@ravnborg.org> Drop use of the deprecated header drmP.h. Make header file self-contained, with only the required set of include files. And fixed fallout in remaining files. Divide include files in blocks and sort them within each block. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +++++++---- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 12 +++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +++---------------- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 ++- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++++++++ 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 81c50772df05..edcd0042bc9c 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -19,15 +19,19 @@ */ #include <linux/clk.h> +#include <linux/mfd/atmel-hlcdc.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm.h> #include <linux/pm_runtime.h> -#include <linux/pinctrl/consumer.h> +#include <video/videomode.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> - -#include <video/videomode.h> +#include <drm/drm_vblank.h> #include "atmel_hlcdc_dc.h" diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 2b794a50e7ab..891708048c8f 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -22,8 +22,20 @@ #include <linux/clk.h> #include <linux/irq.h> #include <linux/irqchip.h> +#include <linux/mfd/atmel-hlcdc.h> #include <linux/module.h> #include <linux/pm_runtime.h> +#include <linux/platform_device.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_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_irq.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "atmel_hlcdc_dc.h" diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h index 0155efb9c443..b56c399f8715 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h @@ -22,23 +22,9 @@ #ifndef DRM_ATMEL_HLCDC_H #define DRM_ATMEL_HLCDC_H -#include <linux/clk.h> -#include <linux/dmapool.h> -#include <linux/irqdomain.h> -#include <linux/mfd/atmel-hlcdc.h> -#include <linux/pwm.h> - -#include <drm/drm_atomic.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_gem_cma_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_panel.h> -#include <drm/drm_plane_helper.h> -#include <drm/drmP.h> +#include <linux/regmap.h> + +#include <drm/drm_plane.h> #define ATMEL_HLCDC_LAYER_CHER 0x0 #define ATMEL_HLCDC_LAYER_CHDR 0x4 diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c index f73d8a92274e..24938bd5adf6 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c @@ -19,9 +19,10 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/media-bus-format.h> #include <linux/of_graph.h> -#include <drm/drmP.h> +#include <drm/drm_encoder.h> #include <drm/drm_of.h> #include <drm/drm_bridge.h> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index 0ee5b7a3a4b0..e66ea9f32185 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -17,6 +17,16 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dmapool.h> +#include <linux/mfd/atmel-hlcdc.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_plane_helper.h> + #include "atmel_hlcdc_dc.h" /** -- 2.20.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-06-30 6:21 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20190630061922.7254-1-sam@ravnborg.org> 2019-06-30 6:18 ` [PATCH v1 01/33] drm/meson: drop use of drmP.h Sam Ravnborg 2019-06-30 6:18 ` Sam Ravnborg 2019-06-30 6:18 ` Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 02/33] drm/xen: " Sam Ravnborg 2019-06-30 6:18 ` [Xen-devel] " Sam Ravnborg 2019-07-01 5:57 ` Oleksandr Andrushchenko 2019-07-01 5:57 ` [Xen-devel] " Oleksandr Andrushchenko 2019-07-01 6:05 ` Sam Ravnborg 2019-07-01 6:05 ` [Xen-devel] " Sam Ravnborg 2019-07-15 16:26 ` Sam Ravnborg 2019-07-15 16:26 ` [Xen-devel] " Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 03/33] drm/stm: " Sam Ravnborg 2019-06-30 6:18 ` Sam Ravnborg 2019-07-01 8:52 ` Benjamin Gaignard 2019-07-01 8:52 ` Benjamin Gaignard 2019-06-30 6:18 ` [PATCH v1 04/33] drm/tve200: " Sam Ravnborg 2019-07-04 7:32 ` Linus Walleij 2019-07-15 16:26 ` Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 05/33] drm/mxsfb: " Sam Ravnborg 2019-06-30 6:18 ` Sam Ravnborg 2019-07-05 20:47 ` Stefan Agner 2019-07-05 20:47 ` Stefan Agner 2019-07-15 16:28 ` Sam Ravnborg 2019-07-15 16:28 ` Sam Ravnborg 2019-07-17 21:51 ` Stefan Agner 2019-07-17 21:51 ` Stefan Agner 2019-06-30 6:18 ` [PATCH v1 06/33] drm/v3d: " Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 07/33] drm/pl111: " Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 08/33] drm/fsl-dcu: " Sam Ravnborg 2019-07-05 20:46 ` Stefan Agner 2019-07-15 16:28 ` Sam Ravnborg 2019-06-30 6:18 ` [PATCH v1 09/33] drm/qxl: " Sam Ravnborg 2019-07-01 6:38 ` Gerd Hoffmann 2019-07-15 16:29 ` Sam Ravnborg 2019-07-15 16:29 ` Sam Ravnborg 2019-07-01 6:38 ` Gerd Hoffmann 2019-06-30 6:18 ` [PATCH v1 10/33] drm/zte: " Sam Ravnborg 2019-07-18 8:07 ` Shawn Guo 2019-06-30 6:19 ` [PATCH v1 11/33] drm/sun4i: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 12/33] drm/vkms: " Sam Ravnborg 2019-07-09 15:00 ` Rodrigo Siqueira 2019-07-15 16:29 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 13/33] drm/vc4: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg [this message] 2019-06-30 6:19 ` [PATCH v1 14/33] drm/atmel_hlcdc: " Sam Ravnborg 2019-07-15 8:15 ` Boris Brezillon 2019-07-15 8:15 ` Boris Brezillon 2019-07-15 16:29 ` Sam Ravnborg 2019-07-15 16:29 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 15/33] drm/r128: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 16/33] drm/udl: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 17/33] drm/omapdrm: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 18/33] drm/selftests: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 21/33] drm/i810: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 22/33] drm/tilcdc: " Sam Ravnborg 2019-08-02 10:03 ` Jyri Sarha 2019-08-03 14:46 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 23/33] drm/i2c/ch7006: " Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 24/33] drm/i2c/sil164: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 25/33] drm/scheduler: " Sam Ravnborg 2019-06-30 12:08 ` Koenig, Christian 2019-07-15 16:30 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 26/33] drm/imx: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 27/33] drm/virtgpu: " Sam Ravnborg 2019-07-01 6:38 ` Gerd Hoffmann 2019-07-01 6:38 ` Gerd Hoffmann 2019-07-15 16:30 ` Sam Ravnborg 2019-07-15 16:30 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 28/33] drm/rockchip: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 29/33] drm/mediatek: " Sam Ravnborg 2019-06-30 6:19 ` Sam Ravnborg 2019-06-30 6:19 ` [PATCH v1 31/33] drm/bochs: " Sam Ravnborg 2019-07-01 6:39 ` Gerd Hoffmann 2019-07-15 16:32 ` Sam Ravnborg 2019-07-15 16:32 ` Sam Ravnborg 2019-07-01 6:39 ` Gerd Hoffmann 2019-06-30 6:19 ` [PATCH v1 33/33] drm/hisilicon: " Sam Ravnborg 2019-07-01 10:44 ` Emil Velikov 2019-07-15 8:19 ` Sam Ravnborg 2019-07-15 10:34 ` Emil Velikov 2019-07-15 16:35 ` Sam Ravnborg [not found] ` <20190630061922.7254-33-sam@ravnborg.org> 2019-06-30 7:34 ` [PATCH v1 32/33] drm/ast: " Thomas Zimmermann 2019-07-15 16:32 ` Sam Ravnborg [not found] ` <20190630061922.7254-31-sam@ravnborg.org> 2019-07-02 13:35 ` [PATCH v1 30/33] drm: add missing include to drm_vram_mm_helper.h Daniel Vetter 2019-07-15 16:31 ` Sam Ravnborg 2019-07-09 19:37 ` [PATCH v1 0/33] drm: drop use of drmp.h in drm-misc Sam Ravnborg
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=20190630061922.7254-15-sam@ravnborg.org \ --to=sam@ravnborg.org \ --cc=airlied@linux.ie \ --cc=alexandre.belloni@bootlin.com \ --cc=bbrezillon@kernel.org \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=ludovic.desroches@microchip.com \ /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: linkBe 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.