Merge tag 'drm-intel-next-fixes-2016-07-25' of git://anongit.freedesktop.org/drm...

[linux-2.6-block.git] / drivers / gpu / drm / arm / Kconfig

diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig
index eaed454e043c73d2008403ec20936c8fcd240ed1..9a18e1bd57b427f7362366ffe9af64d02b21d63c 100644 (file)
--- a/drivers/gpu/drm/arm/Kconfig
+++ b/drivers/gpu/drm/arm/Kconfig
@@ -9,7 +9,6 @@ config DRM_HDLCD
        depends on COMMON_CLK
        select DRM_ARM
        select DRM_KMS_HELPER
-       select DRM_KMS_FB_HELPER
        select DRM_KMS_CMA_HELPER
        help
          Choose this option if you have an ARM High Definition Colour LCD
@@ -25,3 +24,19 @@ config DRM_HDLCD_SHOW_UNDERRUN
          Enable this option to show in red colour the pixels that the
          HDLCD device did not fetch from framebuffer due to underrun
          conditions.
+
+config DRM_MALI_DISPLAY
+       tristate "ARM Mali Display Processor"
+       depends on DRM && OF && (ARM || ARM64)
+       depends on COMMON_CLK
+       select DRM_ARM
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
+       select VIDEOMODE_HELPERS
+       help
+         Choose this option if you want to compile the ARM Mali Display
+         Processor driver. It supports the DP500, DP550 and DP650 variants
+         of the hardware.
+
+         If compiled as a module it will be called mali-dp.