63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 25d4d4e2d243622dfbd35a29e3fee9ce5f099fd2 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Mon, 6 Jun 2011 00:58:46 +0100
|
|
Subject: [PATCH] nouveau: ACPI support is dependent on X86
|
|
|
|
The ACPI support code probably wasn't very useful on ia64, and now
|
|
depends on mxm-wmi which is definitely x86-only.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/gpu/drm/nouveau/Kconfig | 4 ++--
|
|
drivers/gpu/drm/nouveau/Makefile | 2 ++
|
|
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
|
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/nouveau/Kconfig
|
|
+++ b/drivers/gpu/drm/nouveau/Kconfig
|
|
@@ -11,8 +11,8 @@ config DRM_NOUVEAU
|
|
select FRAMEBUFFER_CONSOLE if !EXPERT
|
|
select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
|
|
select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
|
|
- select ACPI_WMI if ACPI
|
|
- select MXM_WMI if ACPI
|
|
+ select ACPI_WMI if ACPI && X86
|
|
+ select MXM_WMI if ACPI && X86
|
|
select POWER_SUPPLY
|
|
help
|
|
Choose this option for open-source nVidia support.
|
|
--- a/drivers/gpu/drm/nouveau/Makefile
|
|
+++ b/drivers/gpu/drm/nouveau/Makefile
|
|
@@ -216,7 +216,9 @@ nouveau-y += nouveau_mem.o
|
|
|
|
# other random bits
|
|
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
|
|
+ifdef CONFIG_X86
|
|
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
|
|
+endif
|
|
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
|
|
|
|
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.h
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.h
|
|
@@ -3,7 +3,7 @@
|
|
|
|
#define ROM_BIOS_PAGE 4096
|
|
|
|
-#if defined(CONFIG_ACPI)
|
|
+#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
|
|
bool nouveau_is_optimus(void);
|
|
bool nouveau_is_v1_dsm(void);
|
|
void nouveau_register_dsm_handler(void);
|
|
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
|
|
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
|
|
@@ -172,7 +172,7 @@ out:
|
|
nv_wr32(bios, pcireg, access);
|
|
}
|
|
|
|
-#if defined(CONFIG_ACPI)
|
|
+#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
|
|
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
|
|
bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
|
|
#else
|