Commit a22719cc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v5.3' of... 

Merge tag 'exynos-drm-next-for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

- Drop the use of drmP.h header file
   drmP.h header file has been deprecated so this patch drops the use of
   this header, and instead includes appropriate header files required.
 - Add COMPILE_TEST flag
   This patch adds COMPILE_TEST dependency to exynos drm driver to
   increase build test coverage. And also, it includes vmalloc.h
   header file to fix one build warning which is introduced when
   building the Linux kernel using sh.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAAQKjZMdBdD8oEa0cNv78FjrpOqu20ozTTvuPEm_XnVo2gRhCQ@mail.gmail.com
parents 53e155f2 156bdac9

drivers/gpu/drm/exynos/Kconfig

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_EXYNOS

	tristate "DRM Support for Samsung SoC EXYNOS Series"

	depends on OF && DRM && (ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM)

	depends on OF && DRM && (ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST)

	select DRM_KMS_HELPER

	select VIDEOMODE_HELPERS

	select SND_SOC_HDMI_CODEC if SND_SOC
@@ -86,7 +86,7 @@ comment "Sub-drivers" 


config DRM_EXYNOS_G2D

	bool "G2D"

	depends on VIDEO_SAMSUNG_S5P_G2D=n

	depends on VIDEO_SAMSUNG_S5P_G2D=n || COMPILE_TEST

	select FRAME_VECTOR

	help

	  Choose this option if you want to use Exynos G2D for DRM.
@@ -114,7 +114,7 @@ config DRM_EXYNOS_SCALER 


config DRM_EXYNOS_GSC

	bool "GScaler"

	depends on VIDEO_SAMSUNG_EXYNOS_GSC=n

	depends on VIDEO_SAMSUNG_EXYNOS_GSC=n || COMPILE_TEST

	select DRM_EXYNOS_IPP

	help

	  Choose this option if you want to use Exynos GSC for DRM.

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 *	Hyungwon Hwang <human.hwang@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"

drivers/gpu/drm/exynos/exynos7_drm_decon.c

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

 *	Ajay Kumar <ajaykumar.rs@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"



/*

drivers/gpu/drm/exynos/exynos_dp.c

+6 −7
Original line number Diff line number Diff line
@@ -6,25 +6,24 @@ 
 * 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/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"

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 
 *	Seung-Woo Kim <sw0312.kim@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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE