From: Dave Airlie <airlied@redhat.com>
Date: Wed, 17 Apr 2013 05:18:32 +0000 (+1000)
Subject: Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=9f7bc6acf78af238a0b8ee0bb86ab62f1fc4f51f

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

Patrik writes:

I haven't had much review or testing on other platforms than Poulsbo but
at least the following Cedarview bug has been squashed and no
regressions reported: https://bugs.freedesktop.org/show_bug.cgi?id=58527

* 'gma500-next' of git://github.com/patjak/drm-gma500:
  drm/gma500: Add debugging info to psb_gtt_restore()
  drm/gma500: Check connector status before restoring sdvo
  gma500:fix build failure for 3.9-rc5
  drm/gma500: Fix hibernation problems on sdvo encoders
  drm/gma500: Add hooks for hibernation
  drm/gma500: Activate the gtt rebuild on suspend/resume
  drm/gma500: Add support for rebuilding the gtt
  drm/gma500: Change fb name so pm-utils doesn't apply quirks
  gma500: Make VGA and HDMI connector hotpluggable
  drm/gma500: Clean up various defines
  drm/gma500: Remove unnecessary function exposure
  drm/gma500: Type clock limits directly into array and remove defines
  drm/gma500: Calculate clock in one function instead of three identical
  drm/gma500: Remove unused i8xx clock limits
  gma500: medfield: Fix possible NULL pointer dereference
  drivers: gpu: drm: gma500: Replaced calls kzalloc & memcpy with kmemdup
  gma500: remove unused drm_psb_no_fb
---

9f7bc6acf78af238a0b8ee0bb86ab62f1fc4f51f
diff --cc drivers/gpu/drm/gma500/Kconfig
index 1188f0fe7e4f,92760ffad2e8..1f6e2dfaaeae
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@@ -1,11 -1,16 +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