Skip to content

Commit 2e4e678

Browse files
atseanpauldaeinki
authored andcommitted
drm/exynos: Move dp driver from video/ to drm/
This patch moves the code from video/ to drm/. This is required the DP driver needs to power on/off in the correct order in relation to fimd. This will also allow the DP driver to participate in drm modeset as well as provide accurate connection detection and edid. Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Inki Dae <[email protected]>
1 parent 055e0c0 commit 2e4e678

File tree

9 files changed

+8
-14
lines changed

9 files changed

+8
-14
lines changed

MAINTAINERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3393,12 +3393,6 @@ S: Maintained
33933393
F: drivers/extcon/
33943394
F: Documentation/extcon/
33953395

3396-
EXYNOS DP DRIVER
3397-
M: Jingoo Han <[email protected]>
3398-
3399-
S: Maintained
3400-
F: drivers/video/exynos/exynos_dp*
3401-
34023396
EXYNOS MIPI DISPLAY DRIVERS
34033397
M: Inki Dae <[email protected]>
34043398
M: Donghwa Lee <[email protected]>

drivers/gpu/drm/exynos/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ config DRM_EXYNOS_FIMD
3131
help
3232
Choose this option if you want to use Exynos FIMD for DRM.
3333

34+
config DRM_EXYNOS_DP
35+
bool "EXYNOS DRM DP driver support"
36+
depends on DRM_EXYNOS && ARCH_EXYNOS
37+
default DRM_EXYNOS
38+
help
39+
This enables support for DP device.
40+
3441
config DRM_EXYNOS_HDMI
3542
bool "Exynos DRM HDMI"
3643
depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV

drivers/gpu/drm/exynos/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exynosdrm-y := exynos_drm_drv.o exynos_drm_encoder.o exynos_drm_connector.o \
1111
exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o
1212
exynosdrm-$(CONFIG_DRM_EXYNOS_DMABUF) += exynos_drm_dmabuf.o
1313
exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o
14+
exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o
1415
exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynos_mixer.o
1516
exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o
1617
exynosdrm-$(CONFIG_DRM_EXYNOS_G2D) += exynos_drm_g2d.o

drivers/video/exynos/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,4 @@ config EXYNOS_LCD_S6E8AX0
2929
If you have an S6E8AX0 MIPI AMOLED LCD Panel, say Y to enable its
3030
LCD control driver.
3131

32-
config EXYNOS_DP
33-
bool "EXYNOS DP driver support"
34-
depends on OF && ARCH_EXYNOS
35-
default n
36-
help
37-
This enables support for DP device.
38-
3932
endif # EXYNOS_VIDEO

drivers/video/exynos/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
obj-$(CONFIG_EXYNOS_MIPI_DSI) += exynos_mipi_dsi.o exynos_mipi_dsi_common.o \
66
exynos_mipi_dsi_lowlevel.o
77
obj-$(CONFIG_EXYNOS_LCD_S6E8AX0) += s6e8ax0.o
8-
obj-$(CONFIG_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o

0 commit comments

Comments
 (0)