Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / Kconfig

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 7f9f6f9e9b7e79926ab1ed791c6fbef8defb3a02..a5e74612100e4ea02de3ab01ffceef42d8f2f61d 100644 (file)
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -6,23 +6,15 @@ config DRM_EXYNOS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE
        select VIDEOMODE_HELPERS
        help
          Choose this option if you have a Samsung SoC EXYNOS chipset.
          If M is selected the module will be called exynosdrm.
 
 config DRM_EXYNOS_IOMMU
-       bool "EXYNOS DRM IOMMU Support"
+       bool
        depends on DRM_EXYNOS && EXYNOS_IOMMU && ARM_DMA_USE_IOMMU
-       help
-         Choose this option if you want to use IOMMU feature for DRM.
-
-config DRM_EXYNOS_DMABUF
-       bool "EXYNOS DRM DMABUF"
-       depends on DRM_EXYNOS
-       help
-         Choose this option if you want to use DMABUF feature for DRM.
+       default y
 
 config DRM_EXYNOS_FIMD
        bool "Exynos DRM FIMD"
@@ -32,9 +24,16 @@ config DRM_EXYNOS_FIMD
        help
          Choose this option if you want to use Exynos FIMD for DRM.
 
+config DRM_EXYNOS7_DECON
+       bool "Exynos DRM DECON"
+       depends on DRM_EXYNOS
+       select FB_MODE_HELPERS
+       help
+         Choose this option if you want to use Exynos DECON for DRM.
+
 config DRM_EXYNOS_DPI
        bool "EXYNOS DRM parallel output support"
-       depends on DRM_EXYNOS_FIMD
+       depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON)
        select DRM_PANEL
        default n
        help
@@ -42,7 +41,7 @@ config DRM_EXYNOS_DPI
 
 config DRM_EXYNOS_DSI
        bool "EXYNOS DRM MIPI-DSI driver support"
-       depends on DRM_EXYNOS_FIMD
+       depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON)
        select DRM_MIPI_DSI
        select DRM_PANEL
        default n
@@ -51,7 +50,7 @@ config DRM_EXYNOS_DSI
 
 config DRM_EXYNOS_DP
        bool "EXYNOS DRM DP driver support"
-       depends on DRM_EXYNOS_FIMD && ARCH_EXYNOS && (DRM_PTN3460=n || DRM_PTN3460=y || DRM_PTN3460=DRM_EXYNOS)
+       depends on (DRM_EXYNOS_FIMD || DRM_EXYNOS7DECON) && ARCH_EXYNOS && (DRM_PTN3460=n || DRM_PTN3460=y || DRM_PTN3460=DRM_EXYNOS)
        default DRM_EXYNOS
        select DRM_PANEL
        help