[v1,1/1] drm/exynos: drop drmP.h usage

Commit Message

Sam Ravnborg June 5, 2019, 2:49 p.m. UTC

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.

Signed-off-by: Sam Ravnborg <[e-mail]>
Cc: Inki Dae <[e-mail]>
Cc: Joonyoung Shim <[e-mail]>
Cc: Seung-Woo Kim <[e-mail]>
Cc: Kyungmin Park <[e-mail]>
Cc: David Airlie <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Kukjin Kim <[e-mail]>
Cc: Krzysztof Kozlowski <[e-mail]>
Cc: Jingoo Han <[e-mail]>
---
 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       |  8 ++--
 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, 151 insertions(+), 136 deletions(-)

Comments

Inki Dae June 21, 2019, 8:29 a.m. UTC | #1

Hi,

19. 6. 5. 오후 11:49에 Sam Ravnborg 이(가) 쓴 글:
> 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.

Build error happens with this patch.

[error log]
--------------------------------------------------------------------------------------------------------
	drivers/gpu/drm/exynos/exynos_drm_g2d.c:196:27: error: field 'base' has incomplete type
	  struct drm_pending_event base;
                           ^
	drivers/gpu/drm/exynos/exynos_drm_g2d.c: In function 'g2d_userptr_get_dma_addr':
	drivers/gpu/drm/exynos/exynos_drm_g2d.c:421:50: error: dereferencing pointer to incomplete type
	  struct drm_exynos_file_private *file_priv = filp->driver_priv;
        -- snip --
--------------------------------------------------------------------------------------------------------

Thanks,
Inki Dae

> 
> Signed-off-by: Sam Ravnborg <[e-mail]>
> Cc: Inki Dae <[e-mail]>
> Cc: Joonyoung Shim <[e-mail]>
> Cc: Seung-Woo Kim <[e-mail]>
> Cc: Kyungmin Park <[e-mail]>
> Cc: David Airlie <[e-mail]>
> Cc: Daniel Vetter <[e-mail]>
> Cc: Kukjin Kim <[e-mail]>
> Cc: Krzysztof Kozlowski <[e-mail]>
> Cc: Jingoo Han <[e-mail]>
> ---
>  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       |  8 ++--
>  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, 151 insertions(+), 136 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> index 73b318a7ef49..40423e237b82 100644
> --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
> @@ -10,7 +10,6 @@
>   * published by the Free Software Foundationr
>   */
>  
> -#include <linux/platform_device.h>
>  #include <linux/clk.h>
>  #include <linux/component.h>
>  #include <linux/iopoll.h>
> @@ -18,11 +17,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 0217ee9a118d..98c2debdd053 100644
> --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
> @@ -11,8 +11,6 @@
>   * option) any later version.
>   *
>   */
> -#include <drm/drmP.h>
> -#include <drm/exynos_drm.h>
>  
>  #include <linux/clk.h>
>  #include <linux/component.h>
> @@ -26,10 +24,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 b0288cf85701..882275e475c9 100644
> --- a/drivers/gpu/drm/exynos/exynos_dp.c
> +++ b/drivers/gpu/drm/exynos/exynos_dp.c
> @@ -10,25 +10,24 @@
>   * option) any later version.
>   */
>  
> -#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 96ee83a798c4..201fdc75ec18 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> @@ -12,11 +12,11 @@
>   * option) any later version.
>   */
>  
> -#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 <[e-mail]>
>  // Author: Andrzej Hajda <[e-mail]>
>  
> -#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 e1ef9dc9ebf3..fa2ae4b56c09 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -11,25 +11,23 @@
>   * option) any later version.
>   */
>  
> +#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 71eb240bc1f4..be53ffd48929 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> @@ -15,9 +15,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 832d22f57b4b..53a13bd85879 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> @@ -12,19 +12,19 @@
>   * option) any later version.
>   */
>  
> -#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 724cb52a374a..2e63b9712617 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> @@ -12,14 +12,15 @@
>   * option) any later version.
>   */
>  
> -#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 c50b0f9270a4..e3d11931c6d8 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> @@ -11,21 +11,22 @@
>   * option) any later version.
>   *
>   */
> -#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 8039e1a3671d..bb7779fcbae0 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -11,26 +11,28 @@
>   * option) any later version.
>   *
>   */
> -#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 c20b3a759370..ff9342737a51 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
> @@ -7,21 +7,21 @@
>   * published by the Free Software Foundationr
>   */
>  
> -#include <linux/kernel.h>
>  #include <linux/clk.h>
>  #include <linux/component.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/workqueue.h>
> -#include <linux/dma-mapping.h>
> -#include <linux/of.h>
>  
> -#include <drm/drmP.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 a55f5ac41bf3..af4cfd840ef1 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
> @@ -9,12 +9,13 @@
>   * option) any later version.
>   */
>  
> -#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 0bfb5e9f6e91..33ed1da97339 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> @@ -11,20 +11,21 @@
>   * option) any later version.
>   *
>   */
> -#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 d1c8411ae7d4..ce2200d401d2 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_mic.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c
> @@ -8,23 +8,25 @@
>   * published by the Free Software Foundationr
>   */
>  
> -#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 e18babb25170..7ddd2cf7048f 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -9,14 +9,14 @@
>   *
>   */
>  
> -#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 b6586fa95ad1..b39586a949a2 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
> @@ -9,21 +9,21 @@
>   * published by the Free Software Foundationr
>   */
>  
> -#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 f1cbdd1e6e3c..a377b21f4ffe 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
> @@ -8,22 +8,22 @@
>   * published by the Free Software Foundationr
>   */
>  
> -#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 44bcb2d60bb2..1ce7dbb64b1b 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> @@ -10,21 +10,20 @@
>   * option) any later version.
>   *
>   */
> -#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 19c252f659dd..a59f88db51a2 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -14,38 +14,37 @@
>   *
>   */
>  
> -#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 b8415e53964d..0ef964d4ba67 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -14,33 +14,32 @@
>   *
>   */
>  
> -#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
>

Patch

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 73b318a7ef49..40423e237b82 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -10,7 +10,6 @@ 
  * published by the Free Software Foundationr
  */
 
-#include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/iopoll.h>
@@ -18,11 +17,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 0217ee9a118d..98c2debdd053 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -11,8 +11,6 @@ 
  * option) any later version.
  *
  */
-#include <drm/drmP.h>
-#include <drm/exynos_drm.h>
 
 #include <linux/clk.h>
 #include <linux/component.h>
@@ -26,10 +24,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 b0288cf85701..882275e475c9 100644
--- a/drivers/gpu/drm/exynos/exynos_dp.c
+++ b/drivers/gpu/drm/exynos/exynos_dp.c
@@ -10,25 +10,24 @@ 
  * option) any later version.
  */
 
-#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 96ee83a798c4..201fdc75ec18 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -12,11 +12,11 @@ 
  * option) any later version.
  */
 
-#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 <[e-mail]>
 // Author: Andrzej Hajda <[e-mail]>
 
-#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 e1ef9dc9ebf3..fa2ae4b56c09 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -11,25 +11,23 @@ 
  * option) any later version.
  */
 
+#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 71eb240bc1f4..be53ffd48929 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -15,9 +15,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 832d22f57b4b..53a13bd85879 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -12,19 +12,19 @@ 
  * option) any later version.
  */
 
-#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 724cb52a374a..2e63b9712617 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -12,14 +12,15 @@ 
  * option) any later version.
  */
 
-#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 c50b0f9270a4..e3d11931c6d8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -11,21 +11,22 @@ 
  * option) any later version.
  *
  */
-#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 8039e1a3671d..bb7779fcbae0 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -11,26 +11,28 @@ 
  * option) any later version.
  *
  */
-#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 c20b3a759370..ff9342737a51 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -7,21 +7,21 @@ 
  * published by the Free Software Foundationr
  */
 
-#include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/component.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/workqueue.h>
-#include <linux/dma-mapping.h>
-#include <linux/of.h>
 
-#include <drm/drmP.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 a55f5ac41bf3..af4cfd840ef1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -9,12 +9,13 @@ 
  * option) any later version.
  */
 
-#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 0bfb5e9f6e91..33ed1da97339 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -11,20 +11,21 @@ 
  * option) any later version.
  *
  */
-#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 d1c8411ae7d4..ce2200d401d2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_mic.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c
@@ -8,23 +8,25 @@ 
  * published by the Free Software Foundationr
  */
 
-#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 e18babb25170..7ddd2cf7048f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -9,14 +9,14 @@ 
  *
  */
 
-#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 b6586fa95ad1..b39586a949a2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -9,21 +9,21 @@ 
  * published by the Free Software Foundationr
  */
 
-#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 f1cbdd1e6e3c..a377b21f4ffe 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
@@ -8,22 +8,22 @@ 
  * published by the Free Software Foundationr
  */
 
-#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 44bcb2d60bb2..1ce7dbb64b1b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -10,21 +10,20 @@ 
  * option) any later version.
  *
  */
-#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 19c252f659dd..a59f88db51a2 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -14,38 +14,37 @@ 
  *
  */
 
-#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 b8415e53964d..0ef964d4ba67 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -14,33 +14,32 @@ 
  *
  */
 
-#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