Merge branch 'slab/common-for-cgroups' into slab/for-linus

[linux-beck.git] / drivers / gpu / drm / exynos / Kconfig

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 3343ac437fe5c886e6dc1879130d67c4340b8601..59a26e577b57f423077d5a2c86d75364f14b6838 100644 (file)
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -10,6 +10,12 @@ config DRM_EXYNOS
          Choose this option if you have a Samsung SoC EXYNOS chipset.
          If M is selected the module will be called exynosdrm.
 
+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.
+
 config DRM_EXYNOS_FIMD
        bool "Exynos DRM FIMD"
        depends on DRM_EXYNOS && !FB_S3C
@@ -27,3 +33,9 @@ config DRM_EXYNOS_VIDI
        depends on DRM_EXYNOS
        help
          Choose this option if you want to use Exynos VIDI for DRM.
+
+config DRM_EXYNOS_G2D
+       bool "Exynos DRM G2D"
+       depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_G2D
+       help
+         Choose this option if you want to use Exynos G2D for DRM.