Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

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

diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig
index 42e665c7e90a35c1d6137a12ee3a48f68c157538..1f6e2dfaaeaef7f557f4ad74ed45530dd28cd2c6 100644 (file)
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@ -1,11 +1,16 @@
 config DRM_GMA500
        tristate "Intel GMA5/600 KMS Framebuffer"
-       depends on DRM && PCI && X86 && EXPERIMENTAL
+       depends on DRM && PCI && X86
        select FB_CFB_COPYAREA
-        select FB_CFB_FILLRECT
-        select FB_CFB_IMAGEBLIT
-        select DRM_KMS_HELPER
-        select DRM_TTM
+       select FB_CFB_FILLRECT
+       select FB_CFB_IMAGEBLIT
+       select DRM_KMS_HELPER
+       select DRM_TTM
+       # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
+       select ACPI_VIDEO if ACPI
+       select BACKLIGHT_CLASS_DEVICE if ACPI
+       select VIDEO_OUTPUT_CONTROL if ACPI
+       select INPUT if ACPI
        help
          Say yes for an experimental 2D KMS framebuffer driver for the
          Intel GMA500 ('Poulsbo') and other Intel IMG based graphics