From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francisco Jerez Subject: Re: [PATCH v2] drm/nouveau: Only select ACPI_VIDEO if its dependencies are met Date: Sat, 25 Dec 2010 19:33:09 +0100 Message-ID: <87wrmxwvmi.fsf@riseup.net> References: <1292099015.3136.45.camel@localhost> <87mxntyj1p.fsf@riseup.net> <1293293852.2874.1009.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0685732246==" Return-path: Received: from mx1.riseup.net (mx1.riseup.net [204.13.164.18]) by gabe.freedesktop.org (Postfix) with ESMTP id 51FCE9E730 for ; Sat, 25 Dec 2010 10:33:25 -0800 (PST) In-Reply-To: <1293293852.2874.1009.camel@localhost> (Ben Hutchings's message of "Sat, 25 Dec 2010 16:17:32 +0000") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Ben Hutchings Cc: Ben Skeggs , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============0685732246== Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Ben Hutchings writes: > 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 > --- > 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 :=3D nouveau_drv.o nouveau_state.o nouveau= _channel.o nouveau_mem.o \ >> > nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) +=3D nouveau_debugfs.o >> > nouveau-$(CONFIG_COMPAT) +=3D nouveau_ioc32.o >> > nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) +=3D nouveau_backlight.o >> > -nouveau-$(CONFIG_ACPI) +=3D nouveau_acpi.o >> > +nouveau-$(CONFIG_ACPI_VIDEO) +=3D nouveau_acpi.o >> >=20=20 >> 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. > Thanks, I've pushed this to the Nouveau kernel tree, with a small clarification to the commit message. > 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/Kc= onfig > 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_OUT= PUT_CONTROL && INPUT > help > Choose this option for open-source nVidia support. >=20=20 > --=20 > 1.7.2.3 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iF4EAREIAAYFAk0WOOUACgkQg5k4nX1Sv1t8RgD9Ebn1rxmBFs/vjM56Nd0PG9Tl IrUjsB8MJ/fEZoU3r5cBAJ5+yZblzhaV+nO25MKPDnFHndZshcSyS2GXb2eKvcz2 =NpiN -----END PGP SIGNATURE----- --==-=-=-- --===============0685732246== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --===============0685732246==--