Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb02b4a authored Oct 26, 2015 by Andrzej Hajda Committed by Inki Dae Nov 03, 2015

drm/exynos: separate Mixer and HDMI drivers



Latest Exynos SoCs does not have Mixer IP, but they still have HDMI IP.
Their drivers should be configurable separately.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

parent 3ae24362

drivers/gpu/drm/exynos/Kconfig

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -62,9 +62,15 @@ config DRM_EXYNOS_DP
	help		help
	This enables support for DP device.		This enables support for DP device.

			config DRM_EXYNOS_MIXER
			bool "Exynos DRM Mixer"
			depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV
			help
			Choose this option if you want to use Exynos Mixer for DRM.

	config DRM_EXYNOS_HDMI		config DRM_EXYNOS_HDMI
	bool "Exynos DRM HDMI"		bool "Exynos DRM HDMI"
	depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV		depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV && (DRM_EXYNOS_MIXER \|\| DRM_EXYNOS5433_DECON)
	help		help
	Choose this option if you want to use Exynos HDMI for DRM.		Choose this option if you want to use Exynos HDMI for DRM.

drivers/gpu/drm/exynos/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,8 @@ exynosdrm-$(CONFIG_DRM_EXYNOS7_DECON) += exynos7_drm_decon.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o		exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o		exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o		exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynos_mixer.o		exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o
			exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o		exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_G2D) += exynos_drm_g2d.o		exynosdrm-$(CONFIG_DRM_EXYNOS_G2D) += exynos_drm_g2d.o
	exynosdrm-$(CONFIG_DRM_EXYNOS_IPP) += exynos_drm_ipp.o		exynosdrm-$(CONFIG_DRM_EXYNOS_IPP) += exynos_drm_ipp.o

drivers/gpu/drm/exynos/exynos_drm_drv.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -529,8 +529,10 @@ static struct platform_driver *const exynos_drm_kms_drivers[] = {
	#ifdef CONFIG_DRM_EXYNOS_DSI		#ifdef CONFIG_DRM_EXYNOS_DSI
	&dsi_driver,		&dsi_driver,
	#endif		#endif
	#ifdef CONFIG_DRM_EXYNOS_HDMI		#ifdef CONFIG_DRM_EXYNOS_MIXER
	&mixer_driver,		&mixer_driver,
			#endif
			#ifdef CONFIG_DRM_EXYNOS_HDMI
	&hdmi_driver,		&hdmi_driver,
	#endif		#endif
	#ifdef CONFIG_DRM_EXYNOS_VIDI		#ifdef CONFIG_DRM_EXYNOS_VIDI