[PATCH v4 1/2] drm/exynos: drop drmP.h usage
Inki Dae
daeinki at gmail.com
Mon Jun 24 13:34:26 UTC 2019
Ah, there was a trivial merge conflict so I merged it manually.
Thanks,
Inki Dae
2019년 6월 24일 (월) 오후 10:32, Inki Dae <daeinki at gmail.com>님이 작성:
>
> Hi Sam,
>
> 2019년 6월 22일 (토) 오후 8:56, Sam Ravnborg <sam at ravnborg.org>님이 작성:
> >
> > Drop use of the deprecated drmP.h file.
> > Replace with forwards / externals as appropriate.
> >
> > While touching the list of include files divide
> > them up in blocks and sort them.
> >
> > v3:
> > - fix build errors in exynos_drm_g2d.c (Inki Dae)
> > The exynos_drm_g2d.c file is not built in the
> > standard configurations and was therefore missed.
>
> Picked it up.
>
> Thanks,
> Inki Dae
>
> >
> > Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> > Cc: Inki Dae <inki.dae at samsung.com>
> > Cc: Joonyoung Shim <jy0922.shim at samsung.com>
> > Cc: Seung-Woo Kim <sw0312.kim at samsung.com>
> > Cc: Kyungmin Park <kyungmin.park at samsung.com>
> > Cc: David Airlie <airlied at linux.ie>
> > Cc: Daniel Vetter <daniel at ffwll.ch>
> > Cc: Kukjin Kim <kgene at kernel.org>
> > Cc: Krzysztof Kozlowski <krzk at kernel.org>
> > Cc: Jingoo Han <jingoohan1 at gmail.com>
> > ---
> > drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 7 +++-
> > drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 ++--
> > drivers/gpu/drm/exynos/exynos_dp.c | 13 +++---
> > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_drm_dma.c | 6 ++-
> > drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 ++--
> > drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 +++---
> > drivers/gpu/drm/exynos/exynos_drm_drv.h | 8 +++-
> > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 21 +++++-----
> > drivers/gpu/drm/exynos/exynos_drm_fb.c | 6 +--
> > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 7 ++--
> > drivers/gpu/drm/exynos/exynos_drm_fimc.c | 15 +++----
> > drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 ++++---
> > drivers/gpu/drm/exynos/exynos_drm_g2d.c | 11 +++--
> > drivers/gpu/drm/exynos/exynos_drm_gem.c | 7 ++--
> > drivers/gpu/drm/exynos/exynos_drm_gsc.c | 13 +++---
> > drivers/gpu/drm/exynos/exynos_drm_ipp.c | 3 +-
> > drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 +++++-----
> > drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +-
> > drivers/gpu/drm/exynos/exynos_drm_rotator.c | 10 ++---
> > drivers/gpu/drm/exynos/exynos_drm_scaler.c | 12 +++---
> > drivers/gpu/drm/exynos/exynos_drm_vidi.c | 9 ++--
> > drivers/gpu/drm/exynos/exynos_hdmi.c | 41 +++++++++----------
> > drivers/gpu/drm/exynos/exynos_mixer.c | 31 +++++++-------
> > 24 files changed, 154 insertions(+), 136 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> > index 0650b619de24..2d5cbfda3ca7 100644
> > --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> > +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> > @@ -7,7 +7,6 @@
> > * Hyungwon Hwang <human.hwang at samsung.com>
> > */
> >
> > -#include <linux/platform_device.h>
> > #include <linux/clk.h>
> > #include <linux/component.h>
> > #include <linux/iopoll.h>
> > @@ -15,11 +14,15 @@
> > #include <linux/mfd/syscon.h>
> > #include <linux/of_device.h>
> > #include <linux/of_gpio.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > #include <linux/regmap.h>
> >
> > -#include "exynos_drm_drv.h"
> > +#include <drm/drm_fourcc.h>
> > +#include <drm/drm_vblank.h>
> > +
> > #include "exynos_drm_crtc.h"
> > +#include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_plane.h"
> > #include "regs-decon5433.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> > index 13509ca8aa35..f0640950bd46 100644
> > --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> > +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> > @@ -6,8 +6,6 @@
> > * Akshu Agarwal <akshua at gmail.com>
> > * Ajay Kumar <ajaykumar.rs at samsung.com>
> > */
> > -#include <drm/drmP.h>
> > -#include <drm/exynos_drm.h>
> >
> > #include <linux/clk.h>
> > #include <linux/component.h>
> > @@ -21,10 +19,14 @@
> > #include <video/of_display_timing.h>
> > #include <video/of_videomode.h>
> >
> > +#include <drm/drm_fourcc.h>
> > +#include <drm/drm_vblank.h>
> > +#include <drm/exynos_drm.h>
> > +
> > #include "exynos_drm_crtc.h"
> > -#include "exynos_drm_plane.h"
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > +#include "exynos_drm_plane.h"
> > #include "regs-decon7.h"
> >
> > /*
> > diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
> > index c0653d007ca4..3a0f0ba8c63a 100644
> > --- a/drivers/gpu/drm/exynos/exynos_dp.c
> > +++ b/drivers/gpu/drm/exynos/exynos_dp.c
> > @@ -6,25 +6,24 @@
> > * Author: Jingoo Han <jg1.han at samsung.com>
> > */
> >
> > -#include <linux/module.h>
> > -#include <linux/platform_device.h>
> > -#include <linux/err.h>
> > #include <linux/clk.h>
> > -#include <linux/of_graph.h>
> > #include <linux/component.h>
> > +#include <linux/err.h>
> > +#include <linux/module.h>
> > +#include <linux/of_graph.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > #include <video/of_display_timing.h>
> > #include <video/of_videomode.h>
> > #include <video/videomode.h>
> >
> > -#include <drm/drmP.h>
> > +#include <drm/bridge/analogix_dp.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_crtc.h>
> > #include <drm/drm_of.h>
> > #include <drm/drm_panel.h>
> > +#include <drm/drm_print.h>
> > #include <drm/drm_probe_helper.h>
> > -
> > -#include <drm/bridge/analogix_dp.h>
> > #include <drm/exynos_drm.h>
> >
> > #include "exynos_drm_crtc.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> > index 98bec7418f01..77ce78986408 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> > @@ -8,11 +8,11 @@
> > * Seung-Woo Kim <sw0312.kim at samsung.com>
> > */
> >
> > -#include <drm/drmP.h>
> > #include <drm/drm_atomic.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_encoder.h>
> > #include <drm/drm_probe_helper.h>
> > +#include <drm/drm_vblank.h>
> >
> > #include "exynos_drm_crtc.h"
> > #include "exynos_drm_drv.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c
> > index bef8bc3c8e00..9ebc02768847 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c
> > @@ -4,11 +4,13 @@
> > // Author: Inki Dae <inki.dae at samsung.com>
> > // Author: Andrzej Hajda <a.hajda at samsung.com>
> >
> > -#include <drm/drmP.h>
> > -#include <drm/exynos_drm.h>
> > #include <linux/dma-iommu.h>
> > #include <linux/dma-mapping.h>
> > #include <linux/iommu.h>
> > +#include <linux/platform_device.h>
> > +
> > +#include <drm/drm_print.h>
> > +#include <drm/exynos_drm.h>
> >
> > #include "exynos_drm_drv.h"
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> > index 6ea92173db9f..87289db12868 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> > @@ -10,14 +10,14 @@
> > * published by the Free Software Foundation.
> > */
> >
> > -#include <drm/drmP.h>
> > +#include <linux/of_graph.h>
> > +#include <linux/regulator/consumer.h>
> > +
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_panel.h>
> > +#include <drm/drm_print.h>
> > #include <drm/drm_probe_helper.h>
> >
> > -#include <linux/of_graph.h>
> > -#include <linux/regulator/consumer.h>
> > -
> > #include <video/of_videomode.h>
> > #include <video/videomode.h>
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > index e43640fc42d3..e19fb8466bef 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > @@ -7,25 +7,23 @@
> > * Seung-Woo Kim <sw0312.kim at samsung.com>
> > */
> >
> > +#include <linux/component.h>
> > #include <linux/pm_runtime.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_probe_helper.h>
> > -
> > -#include <linux/component.h>
> > -
> > #include <drm/exynos_drm.h>
> >
> > #include "exynos_drm_drv.h"
> > -#include "exynos_drm_fbdev.h"
> > #include "exynos_drm_fb.h"
> > +#include "exynos_drm_fbdev.h"
> > +#include "exynos_drm_g2d.h"
> > #include "exynos_drm_gem.h"
> > -#include "exynos_drm_plane.h"
> > #include "exynos_drm_ipp.h"
> > +#include "exynos_drm_plane.h"
> > #include "exynos_drm_vidi.h"
> > -#include "exynos_drm_g2d.h"
> >
> > #define DRIVER_NAME "exynos"
> > #define DRIVER_DESC "Samsung SoC DRM"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> > index 18b03b83f8a3..139c04d16b0d 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> > @@ -11,9 +11,15 @@
> > #ifndef _EXYNOS_DRM_DRV_H_
> > #define _EXYNOS_DRM_DRV_H_
> >
> > -#include <drm/drmP.h>
> > #include <linux/module.h>
> >
> > +#include <drm/drm_crtc.h>
> > +#include <drm/drm_device.h>
> > +#include <drm/drm_plane.h>
> > +
> > +struct drm_crtc_state;
> > +struct drm_display_mode;
> > +
> > #define MAX_CRTC 3
> > #define MAX_PLANE 5
> > #define MAX_FB_BUFFER 4
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> > index 63a4b5074a99..5f6f523821a2 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> > @@ -10,16 +10,9 @@
> > * published by the Free Software Foundation.
> > */
> >
> > -#include <asm/unaligned.h>
> > -
> > -#include <drm/drmP.h>
> > -#include <drm/drm_atomic_helper.h>
> > -#include <drm/drm_fb_helper.h>
> > -#include <drm/drm_mipi_dsi.h>
> > -#include <drm/drm_panel.h>
> > -#include <drm/drm_probe_helper.h>
> > -
> > #include <linux/clk.h>
> > +#include <linux/delay.h>
> > +#include <linux/component.h>
> > #include <linux/gpio/consumer.h>
> > #include <linux/irq.h>
> > #include <linux/of_device.h>
> > @@ -27,11 +20,19 @@
> > #include <linux/of_graph.h>
> > #include <linux/phy/phy.h>
> > #include <linux/regulator/consumer.h>
> > -#include <linux/component.h>
> > +
> > +#include <asm/unaligned.h>
> >
> > #include <video/mipi_display.h>
> > #include <video/videomode.h>
> >
> > +#include <drm/drm_atomic_helper.h>
> > +#include <drm/drm_fb_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 "exynos_drm_crtc.h"
> > #include "exynos_drm_drv.h"
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> > index ea048905849a..64370b634cca 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> > @@ -8,19 +8,19 @@
> > * Seung-Woo Kim <sw0312.kim at samsung.com>
> > */
> >
> > -#include <drm/drmP.h>
> > #include <drm/drm_atomic.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_crtc.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>
> > -#include <uapi/drm/exynos_drm.h>
> > +#include <drm/exynos_drm.h>
> >
> > +#include "exynos_drm_crtc.h"
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_fbdev.h"
> > -#include "exynos_drm_crtc.h"
> >
> > static int check_fb_gem_memory_type(struct drm_device *drm_dev,
> > struct exynos_drm_gem *exynos_gem)
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> > index 9dc33c6b6687..aefcd624fe32 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> > @@ -8,14 +8,15 @@
> > * Seung-Woo Kim <sw0312.kim at samsung.com>
> > */
> >
> > -#include <drm/drmP.h>
> > +#include <linux/console.h>
> > +#include <linux/dma-mapping.h>
> > +
> > #include <drm/drm_crtc.h>
> > #include <drm/drm_fb_helper.h>
> > +#include <drm/drm_fourcc.h>
> > #include <drm/drm_probe_helper.h>
> > #include <drm/exynos_drm.h>
> >
> > -#include <linux/console.h>
> > -
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_fbdev.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> > index 0db29690ede3..a594ab7be2c0 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> > @@ -6,21 +6,22 @@
> > * Jinyoung Jeon <jy0.jeon at samsung.com>
> > * Sangmin Lee <lsmin.lee at samsung.com>
> > */
> > -#include <linux/kernel.h>
> > +
> > +#include <linux/clk.h>
> > #include <linux/component.h>
> > -#include <linux/platform_device.h>
> > +#include <linux/kernel.h>
> > #include <linux/mfd/syscon.h>
> > -#include <linux/regmap.h>
> > -#include <linux/clk.h>
> > -#include <linux/pm_runtime.h>
> > #include <linux/of.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/pm_runtime.h>
> > +#include <linux/regmap.h>
> > #include <linux/spinlock.h>
> >
> > -#include <drm/drmP.h>
> > #include <drm/exynos_drm.h>
> > -#include "regs-fimc.h"
> > +
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_ipp.h"
> > +#include "regs-fimc.h"
> >
> > /*
> > * FIMC stands for Fully Interactive Mobile Camera and
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> > index e9106b1f4a50..8d0a929104e5 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> > @@ -6,26 +6,28 @@
> > * Joonyoung Shim <jy0922.shim at samsung.com>
> > * Inki Dae <inki.dae at samsung.com>
> > */
> > -#include <drm/drmP.h>
> >
> > -#include <linux/kernel.h>
> > -#include <linux/platform_device.h>
> > #include <linux/clk.h>
> > +#include <linux/component.h>
> > +#include <linux/kernel.h>
> > +#include <linux/mfd/syscon.h>
> > #include <linux/of.h>
> > #include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > -#include <linux/component.h>
> > -#include <linux/mfd/syscon.h>
> > #include <linux/regmap.h>
> >
> > #include <video/of_display_timing.h>
> > #include <video/of_videomode.h>
> > #include <video/samsung_fimd.h>
> > +
> > +#include <drm/drm_fourcc.h>
> > +#include <drm/drm_vblank.h>
> > #include <drm/exynos_drm.h>
> >
> > +#include "exynos_drm_crtc.h"
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > -#include "exynos_drm_crtc.h"
> > #include "exynos_drm_plane.h"
> >
> > /*
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> > index 2e4b9434245b..50904eee96f7 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> > @@ -4,21 +4,24 @@
> > * Authors: Joonyoung Shim <jy0922.shim at samsung.com>
> > */
> >
> > -#include <linux/kernel.h>
> > #include <linux/clk.h>
> > #include <linux/component.h>
> > +#include <linux/delay.h>
> > +#include <linux/dma-mapping.h>
> > #include <linux/err.h>
> > #include <linux/interrupt.h>
> > #include <linux/io.h>
> > +#include <linux/kernel.h>
> > +#include <linux/of.h>
> > #include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > #include <linux/slab.h>
> > +#include <linux/uaccess.h>
> > #include <linux/workqueue.h>
> > -#include <linux/dma-mapping.h>
> > -#include <linux/of.h>
> >
> > -#include <drm/drmP.h>
> > +#include <drm/drm_file.h>
> > #include <drm/exynos_drm.h>
> > +
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_g2d.h"
> > #include "exynos_drm_gem.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> > index d8f1fe9b68d8..d734d9d51762 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> > @@ -5,12 +5,13 @@
> > * Author: Inki Dae <inki.dae at samsung.com>
> > */
> >
> > -#include <drm/drmP.h>
> > -#include <drm/drm_vma_manager.h>
> >
> > -#include <linux/shmem_fs.h>
> > #include <linux/dma-buf.h>
> > #include <linux/pfn_t.h>
> > +#include <linux/shmem_fs.h>
> > +
> > +#include <drm/drm_prime.h>
> > +#include <drm/drm_vma_manager.h>
> > #include <drm/exynos_drm.h>
> >
> > #include "exynos_drm_drv.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> > index 05b0fe21b81e..1e4b21c49a06 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> > @@ -6,20 +6,21 @@
> > * Jinyoung Jeon <jy0.jeon at samsung.com>
> > * Sangmin Lee <lsmin.lee at samsung.com>
> > */
> > -#include <linux/kernel.h>
> > -#include <linux/component.h>
> > -#include <linux/platform_device.h>
> > +
> > #include <linux/clk.h>
> > -#include <linux/pm_runtime.h>
> > +#include <linux/component.h>
> > +#include <linux/kernel.h>
> > #include <linux/mfd/syscon.h>
> > #include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/pm_runtime.h>
> > #include <linux/regmap.h>
> >
> > -#include <drm/drmP.h>
> > #include <drm/exynos_drm.h>
> > -#include "regs-gsc.h"
> > +
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_ipp.h"
> > +#include "regs-gsc.h"
> >
> > /*
> > * GSC stands for General SCaler and
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
> > index c862099723a0..d45bfab6fe40 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
> > @@ -16,10 +16,9 @@
> > * all copies or substantial portions of the Software.
> > */
> >
> > -
> > #include <drm/drmP.h>
> > #include <drm/drm_mode.h>
> > -#include <uapi/drm/exynos_drm.h>
> > +#include <drm/exynos_drm.h>
> >
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_gem.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_mic.c b/drivers/gpu/drm/exynos/exynos_drm_mic.c
> > index 8363cb40daed..b78e8c5ba553 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_mic.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c
> > @@ -5,23 +5,25 @@
> > * Hyungwon Hwang <human.hwang at samsung.com>
> > */
> >
> > -#include <linux/platform_device.h>
> > -#include <video/of_videomode.h>
> > -#include <linux/of_address.h>
> > -#include <video/videomode.h>
> > -#include <linux/module.h>
> > +#include <linux/clk.h>
> > +#include <linux/component.h>
> > #include <linux/delay.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > #include <linux/mutex.h>
> > #include <linux/of.h>
> > +#include <linux/of_address.h>
> > #include <linux/of_graph.h>
> > -#include <linux/clk.h>
> > -#include <linux/component.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > -#include <drm/drmP.h>
> > -#include <drm/drm_encoder.h>
> > -#include <linux/mfd/syscon.h>
> > #include <linux/regmap.h>
> >
> > +#include <video/of_videomode.h>
> > +#include <video/videomode.h>
> > +
> > +#include <drm/drm_encoder.h>
> > +#include <drm/drm_print.h>
> > +
> > #include "exynos_drm_drv.h"
> >
> > /* Sysreg registers for MIC */
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > index 2f3c9b993acd..b29afced7374 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > @@ -4,14 +4,14 @@
> > * Authors: Joonyoung Shim <jy0922.shim at samsung.com>
> > */
> >
> > -#include <drm/drmP.h>
> >
> > #include <drm/drm_atomic.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_plane_helper.h>
> > #include <drm/exynos_drm.h>
> > -#include "exynos_drm_drv.h"
> > +
> > #include "exynos_drm_crtc.h"
> > +#include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_gem.h"
> > #include "exynos_drm_plane.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
> > index 85e30cb6c23f..8ebad2740ad5 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
> > @@ -6,21 +6,21 @@
> > * Eunchul Kim <chulspro.kim at samsung.com>
> > */
> >
> > -#include <linux/kernel.h>
> > +#include <linux/clk.h>
> > #include <linux/component.h>
> > #include <linux/err.h>
> > #include <linux/interrupt.h>
> > #include <linux/io.h>
> > -#include <linux/platform_device.h>
> > -#include <linux/clk.h>
> > +#include <linux/kernel.h>
> > #include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> >
> > -#include <drm/drmP.h>
> > #include <drm/exynos_drm.h>
> > -#include "regs-rotator.h"
> > +
> > #include "exynos_drm_drv.h"
> > #include "exynos_drm_ipp.h"
> > +#include "regs-rotator.h"
> >
> > /*
> > * Rotator supports image crop/rotator and input/output DMA operations.
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
> > index ec9c1b7d3103..9af096479e1c 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
> > @@ -5,22 +5,22 @@
> > * Andrzej Pietrasiewicz <andrzejtp2010 at gmail.com>
> > */
> >
> > -#include <linux/kernel.h>
> > +#include <linux/clk.h>
> > #include <linux/component.h>
> > #include <linux/err.h>
> > #include <linux/interrupt.h>
> > #include <linux/io.h>
> > -#include <linux/platform_device.h>
> > -#include <linux/clk.h>
> > +#include <linux/kernel.h>
> > #include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> >
> > -#include <drm/drmP.h>
> > #include <drm/exynos_drm.h>
> > -#include "regs-scaler.h"
> > -#include "exynos_drm_fb.h"
> > +
> > #include "exynos_drm_drv.h"
> > +#include "exynos_drm_fb.h"
> > #include "exynos_drm_ipp.h"
> > +#include "regs-scaler.h"
> >
> > #define scaler_read(offset) readl(scaler->regs + (offset))
> > #define scaler_write(cfg, offset) writel(cfg, scaler->regs + (offset))
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > index eb2667b4500c..65b891cb9c50 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > @@ -5,21 +5,20 @@
> > * Authors:
> > * Inki Dae <inki.dae at samsung.com>
> > */
> > -#include <drm/drmP.h>
> >
> > +#include <linux/component.h>
> > #include <linux/kernel.h>
> > #include <linux/platform_device.h>
> > -#include <linux/component.h>
> > #include <linux/timer.h>
> >
> > -#include <drm/exynos_drm.h>
> > -
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_edid.h>
> > #include <drm/drm_probe_helper.h>
> > +#include <drm/drm_vblank.h>
> > +#include <drm/exynos_drm.h>
> >
> > -#include "exynos_drm_drv.h"
> > #include "exynos_drm_crtc.h"
> > +#include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_plane.h"
> > #include "exynos_drm_vidi.h"
> > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > index 894a99793633..bc1565f1822a 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > @@ -9,38 +9,37 @@
> > * Based on drivers/media/video/s5p-tv/hdmi_drv.c
> > */
> >
> > -#include <drm/drmP.h>
> > -#include <drm/drm_atomic_helper.h>
> > -#include <drm/drm_edid.h>
> > -#include <drm/drm_probe_helper.h>
> > -
> > -#include "regs-hdmi.h"
> > -
> > -#include <linux/kernel.h>
> > -#include <linux/wait.h>
> > -#include <linux/i2c.h>
> > -#include <linux/platform_device.h>
> > -#include <linux/interrupt.h>
> > -#include <linux/irq.h>
> > -#include <linux/delay.h>
> > -#include <linux/pm_runtime.h>
> > +#include <drm/exynos_drm.h>
> > #include <linux/clk.h>
> > +#include <linux/component.h>
> > +#include <linux/delay.h>
> > #include <linux/gpio/consumer.h>
> > -#include <linux/regulator/consumer.h>
> > +#include <linux/hdmi.h>
> > +#include <linux/i2c.h>
> > +#include <linux/interrupt.h>
> > #include <linux/io.h>
> > +#include <linux/irq.h>
> > +#include <linux/kernel.h>
> > +#include <linux/mfd/syscon.h>
> > #include <linux/of_address.h>
> > #include <linux/of_device.h>
> > #include <linux/of_graph.h>
> > -#include <linux/hdmi.h>
> > -#include <linux/component.h>
> > -#include <linux/mfd/syscon.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/pm_runtime.h>
> > #include <linux/regmap.h>
> > -#include <sound/hdmi-codec.h>
> > -#include <drm/exynos_drm.h>
> > +#include <linux/regulator/consumer.h>
> > +#include <linux/wait.h>
> >
> > +#include <sound/hdmi-codec.h>
> > #include <media/cec-notifier.h>
> >
> > +#include <drm/drm_atomic_helper.h>
> > +#include <drm/drm_edid.h>
> > +#include <drm/drm_print.h>
> > +#include <drm/drm_probe_helper.h>
> > +
> > #include "exynos_drm_crtc.h"
> > +#include "regs-hdmi.h"
> >
> > #define HOTPLUG_DEBOUNCE_MS 1100
> >
> > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> > index db0b698ea8ea..7b24338fad3c 100644
> > --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> > @@ -9,33 +9,32 @@
> > * Based on drivers/media/video/s5p-tv/mixer_reg.c
> > */
> >
> > -#include <drm/drmP.h>
> > -
> > -#include "regs-mixer.h"
> > -#include "regs-vp.h"
> > -
> > -#include <linux/kernel.h>
> > -#include <linux/ktime.h>
> > -#include <linux/spinlock.h>
> > -#include <linux/wait.h>
> > +#include <linux/clk.h>
> > +#include <linux/component.h>
> > +#include <linux/delay.h>
> > #include <linux/i2c.h>
> > -#include <linux/platform_device.h>
> > #include <linux/interrupt.h>
> > #include <linux/irq.h>
> > -#include <linux/delay.h>
> > -#include <linux/pm_runtime.h>
> > -#include <linux/clk.h>
> > -#include <linux/regulator/consumer.h>
> > +#include <linux/kernel.h>
> > +#include <linux/ktime.h>
> > #include <linux/of.h>
> > #include <linux/of_device.h>
> > -#include <linux/component.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/pm_runtime.h>
> > +#include <linux/regulator/consumer.h>
> > +#include <linux/spinlock.h>
> > +#include <linux/wait.h>
> >
> > +#include <drm/drm_fourcc.h>
> > +#include <drm/drm_vblank.h>
> > #include <drm/exynos_drm.h>
> >
> > -#include "exynos_drm_drv.h"
> > #include "exynos_drm_crtc.h"
> > +#include "exynos_drm_drv.h"
> > #include "exynos_drm_fb.h"
> > #include "exynos_drm_plane.h"
> > +#include "regs-mixer.h"
> > +#include "regs-vp.h"
> >
> > #define MIXER_WIN_NR 3
> > #define VP_DEFAULT_WIN 2
> > --
> > 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