72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
From 778b1b6b848d046ac1566b36c8b39c4cda9f8c35 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 11 Dec 2010 06:13:45 +0000
|
|
Subject: [PATCH 3/4] drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
|
|
|
|
CONFIG_ACPI_VIDEO depends on more than just CONFIG_ACPI, so add those
|
|
dependencies to the Kconfig select condition and make the code
|
|
conditional on CONFIG_ACPI_VIDEO.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/gpu/drm/nouveau/Kconfig | 2 +-
|
|
drivers/gpu/drm/nouveau/Makefile | 2 +-
|
|
drivers/gpu/drm/nouveau/nouveau_backlight.c | 2 +-
|
|
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
|
|
index 72730e9..21d6c29 100644
|
|
--- a/drivers/gpu/drm/nouveau/Kconfig
|
|
+++ b/drivers/gpu/drm/nouveau/Kconfig
|
|
@@ -10,7 +10,7 @@ config DRM_NOUVEAU
|
|
select FB
|
|
select FRAMEBUFFER_CONSOLE if !EMBEDDED
|
|
select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
|
|
- select ACPI_VIDEO if ACPI
|
|
+ select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
|
|
help
|
|
Choose this option for open-source nVidia support.
|
|
|
|
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
|
|
index 23fa82d..101a0f6 100644
|
|
--- a/drivers/gpu/drm/nouveau/Makefile
|
|
+++ b/drivers/gpu/drm/nouveau/Makefile
|
|
@@ -30,6 +30,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
|
|
nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
|
|
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
|
|
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
|
|
-nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
|
|
+nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o
|
|
|
|
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
|
|
index b14c811..6f3f463 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
|
|
@@ -137,7 +137,7 @@ int nouveau_backlight_init(struct drm_device *dev)
|
|
{
|
|
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
|
|
|
-#ifdef CONFIG_ACPI
|
|
+#ifdef CONFIG_ACPI_VIDEO
|
|
if (acpi_video_backlight_support()) {
|
|
NV_INFO(dev, "ACPI backlight interface available, "
|
|
"not registering our own\n");
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
|
|
index 1c7db64..a18d0ed 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
|
|
@@ -894,7 +894,7 @@ extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
|
|
|
|
/* nouveau_acpi.c */
|
|
#define ROM_BIOS_PAGE 4096
|
|
-#if defined(CONFIG_ACPI)
|
|
+#if defined(CONFIG_ACPI_VIDEO)
|
|
void nouveau_register_dsm_handler(void);
|
|
void nouveau_unregister_dsm_handler(void);
|
|
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
|
|
--
|
|
1.7.2.3
|
|
|