Commit 2bda34d7 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Inki Dae
Browse files

drm/exynos: drop drmP.h usage 



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.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Jingoo Han <jingoohan1@gmail.com>
Fixed merge conflict.
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 14808a12

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,6 @@ 
 *	Hyungwon Hwang <human.hwang@samsung.com>

 *	Hyungwon Hwang <human.hwang@samsung.com>

 */

 */





#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/component.h>

#include <linux/component.h>

#include <linux/iopoll.h>

#include <linux/iopoll.h>
@@ -15,11 +14,15 @@ 
#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/regmap.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_crtc.h"

#include "exynos_drm_drv.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_plane.h"

#include "exynos_drm_plane.h"

#include "regs-decon5433.h"

#include "regs-decon5433.h"

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -6,8 +6,6 @@ 
 *	Akshu Agarwal <akshua@gmail.com>

 *	Akshu Agarwal <akshua@gmail.com>

 *	Ajay Kumar <ajaykumar.rs@samsung.com>

 *	Ajay Kumar <ajaykumar.rs@samsung.com>

 */

 */

#include <drm/drmP.h>

#include <drm/exynos_drm.h>





#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/component.h>

#include <linux/component.h>
@@ -21,10 +19,14 @@ 
#include <video/of_display_timing.h>

#include <video/of_display_timing.h>

#include <video/of_videomode.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_crtc.h"

#include "exynos_drm_plane.h"

#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_plane.h"

#include "regs-decon7.h"

#include "regs-decon7.h"





/*

/*

drivers/gpu/drm/exynos/exynos_dp.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -6,25 +6,24 @@ 
 * Author: Jingoo Han <jg1.han@samsung.com>

 * Author: Jingoo Han <jg1.han@samsung.com>

 */

 */





#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/of_graph.h>

#include <linux/component.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 <linux/pm_runtime.h>

#include <video/of_display_timing.h>

#include <video/of_display_timing.h>

#include <video/of_videomode.h>

#include <video/of_videomode.h>

#include <video/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_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc.h>

#include <drm/drm_of.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>



#include <drm/bridge/analogix_dp.h>

#include <drm/exynos_drm.h>

#include <drm/exynos_drm.h>





#include "exynos_drm_crtc.h"

#include "exynos_drm_crtc.h"

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,11 +8,11 @@ 
 *	Seung-Woo Kim <sw0312.kim@samsung.com>

 *	Seung-Woo Kim <sw0312.kim@samsung.com>

 */

 */





#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_encoder.h>

#include <drm/drm_encoder.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>





#include "exynos_drm_crtc.h"

#include "exynos_drm_crtc.h"

#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"

drivers/gpu/drm/exynos/exynos_drm_dma.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -4,11 +4,13 @@ 
// Author: Inki Dae <inki.dae@samsung.com>

// Author: Inki Dae <inki.dae@samsung.com>

// Author: Andrzej Hajda <a.hajda@samsung.com>

// Author: Andrzej Hajda <a.hajda@samsung.com>





#include <drm/drmP.h>

#include <drm/exynos_drm.h>

#include <linux/dma-iommu.h>

#include <linux/dma-iommu.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/iommu.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"

#include "exynos_drm_drv.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE