From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Hutchings <ben@decadent.org.uk>
Subject: [PATCH v2] drm/nouveau: Only select ACPI_VIDEO if its dependencies
	are met
Date: Sat, 25 Dec 2010 16:17:32 +0000
Message-ID: <1293293852.2874.1009.camel@localhost>
References: <1292099015.3136.45.camel@localhost> <87mxntyj1p.fsf@riseup.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from shadbolt.e.decadent.org.uk (shadbolt.e.decadent.org.uk
	[88.96.1.126])
	by gabe.freedesktop.org (Postfix) with ESMTP id A41269E790
	for <dri-devel@lists.freedesktop.org>;
	Sat, 25 Dec 2010 08:17:46 -0800 (PST)
In-Reply-To: <87mxntyj1p.fsf@riseup.net>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: Francisco Jerez <currojerez@riseup.net>, David Airlie <airlied@linux.ie>, Ben Skeggs <bskeggs@redhat.com>
Cc: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

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>
---
On Sat, 2010-12-25 at 16:21 +0100, Francisco Jerez wrote:
[...]
> > --- 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
> >  
> Not sure this makes sense, most of the code in nouveau_acpi.c doesn't
> depend on ACPI_VIDEO at all. Do you really need to do it? Apparently all
> the ACPI_VIDEO functions will be turned into stubs (see "acpi/video.h")
> on kernels without ACPI_VIDEO support.
[...]

You're right; there's no need for the changes outside of Kconfig.

Ben.

 drivers/gpu/drm/nouveau/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 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.
 
-- 
1.7.2.3

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.