Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/nouveau: always select ACPI_VIDEO if ACPI is enabled.

Having nouveau builtin would still allow ACPI_VIDEO to be used as external module
if some of the deps for acpi_video have not been met, which would result in a linking
failure. Solve this by selecting all dependencies as well.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Maarten Lankhorst 12 years ago
parent
27f06b2dbb
commit
1107276c8a
2 changed files with 8 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      drivers/gpu/drm/Kconfig
  2. 7 0
      drivers/gpu/drm/nouveau/Kconfig

+ 1 - 0
drivers/gpu/drm/Kconfig
View File 

@@ -139,6 +139,7 @@ config DRM_I915
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI
 
 	select VIDEO_OUTPUT_CONTROL if ACPI
 
 	select INPUT if ACPI
 
+	select THERMAL if ACPI
 
 	select ACPI_VIDEO if ACPI
 
 	select ACPI_BUTTON if ACPI
 
 	help

+ 7 - 0
drivers/gpu/drm/nouveau/Kconfig
View File 

@@ -15,6 +15,13 @@ config DRM_NOUVEAU
 
 	select ACPI_WMI if ACPI && X86
 
 	select MXM_WMI if ACPI && X86
 
 	select POWER_SUPPLY
 
+	# Similar to i915, we need to select ACPI_VIDEO and it's dependencies
 
+	select BACKLIGHT_LCD_SUPPORT if ACPI && X86
 
+	select BACKLIGHT_CLASS_DEVICE if ACPI && X86
 
+	select VIDEO_OUTPUT_CONTROL if ACPI && X86
 
+	select INPUT if ACPI && X86
 
+	select THERMAL if ACPI && X86
 
+	select ACPI_VIDEO if ACPI && X86
 
 	help
 
 	  Choose this option for open-source nVidia support.