From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francisco Jerez Subject: Re: [PATCH] drm/nouveau: Only select ACPI_VIDEO if its dependencies are met Date: Sat, 25 Dec 2010 16:21:54 +0100 Message-ID: <87mxntyj1p.fsf@riseup.net> References: <1292099015.3136.45.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1924828839==" Return-path: Received: from mx1.riseup.net (mx1.riseup.net [204.13.164.18]) by gabe.freedesktop.org (Postfix) with ESMTP id 28B7B9E772 for ; Sat, 25 Dec 2010 07:22:14 -0800 (PST) In-Reply-To: <1292099015.3136.45.camel@localhost> (Ben Hutchings's message of "Sat, 11 Dec 2010 20:23:35 +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 --===============1924828839== 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. > > Fixes building for ia64 (ACPI && !X86). > > Signed-off-by: Ben Hutchings First, I'm sorry for the late reply. > --- > Please send this up to Linus for 2.6.37. > > Ben. > > 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/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 This looks OK to me. > diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/M= akefile > index 23fa82d..101a0f6 100644 > --- 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_ch= annel.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. > obj-$(CONFIG_DRM_NOUVEAU)+=3D nouveau.o > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/dr= m/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 =3D dev->dev_private; >=20=20 > -#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/nouv= eau/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); >=20=20 > /* 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); --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iF4EAREIAAYFAk0WDBMACgkQg5k4nX1Sv1sA+gEAmnQ/tR/3/HuiOepk3XCCGxB6 QgHKTYBOYeIy8e8StwsA/RwthCFFuz3HFRNx03tdpGEbAHWoakiRFpY1Ls6JT9UW =wozO -----END PGP SIGNATURE----- --==-=-=-- --===============1924828839== 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 --===============1924828839==--