From patchwork Wed Apr 17 10:10:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 2452941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id A89C03FC64 for ; Wed, 17 Apr 2013 10:10:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76DEEE668A for ; Wed, 17 Apr 2013 03:10:37 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.skyhub.de (mail.skyhub.de [78.46.96.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 79873E5C33 for ; Wed, 17 Apr 2013 03:10:13 -0700 (PDT) X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1366193411; bh=aVejGhsDmOdwLBXsZBbCS6/Gr4oKI4UKp2oJlonomFg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=CpaCfin0tceE3Vy5NxgHGWOGCeYJP+N6M3u6pl cWRkKP1Hg/iI3tuJFaEKOA71FV/IAjDUw+IR2ILZFjugU+iIWuXoeAjQ9Jwepab4Ytq Afva4G3wrEzo2XgUh2WubX4Tlav2syrYeJDqpFXtNTZQsEsd6AI4a3G4IEk5joGooo= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tqRWlSshbwsb; Wed, 17 Apr 2013 12:10:11 +0200 (CEST) Received: from liondog.tnic (p54B7F5FB.dip.t-dialin.net [84.183.245.251]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 4DA331D9CF2; Wed, 17 Apr 2013 12:10:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1366193411; bh=aVejGhsDmOdwLBXsZBbCS6/Gr4oKI4UKp2oJlonomFg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=CpaCfin0tceE3Vy5NxgHGWOGCeYJP+N6M3u6pl cWRkKP1Hg/iI3tuJFaEKOA71FV/IAjDUw+IR2ILZFjugU+iIWuXoeAjQ9Jwepab4Ytq Afva4G3wrEzo2XgUh2WubX4Tlav2syrYeJDqpFXtNTZQsEsd6AI4a3G4IEk5joGooo= Received: by liondog.tnic (Postfix, from userid 1000) id 518A0100E17; Wed, 17 Apr 2013 12:10:07 +0200 (CEST) Date: Wed, 17 Apr 2013 12:10:07 +0200 From: Borislav Petkov To: Linus Torvalds Subject: Re: [PATCH v2] drm/nouveau: always select ACPI_VIDEO if ACPI is enabled. Message-ID: <20130417101007.GC11807@pd.tnic> References: <20130204152344.GG13909@pd.tnic> <510FD6A2.80101@canonical.com> <20130205145232.GI4827@pd.tnic> <5111277B.5020607@canonical.com> <20130205162206.GJ4827@pd.tnic> <20130220185633.GF16775@pd.tnic> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130220185633.GF16775@pd.tnic> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Michal Marek , lkml , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org On Wed, Feb 20, 2013 at 07:56:33PM +0100, Borislav Petkov wrote: > On Tue, Feb 05, 2013 at 05:22:06PM +0100, Borislav Petkov wrote: > > On Tue, Feb 05, 2013 at 04:38:35PM +0100, Maarten Lankhorst wrote: > > > Argh, next attempt, based on i915's Kconfig. > > > > > > It seems that not only I have to select ACPI_VIDEO, I also have to select all the dependencies. > > > Is this a Kconfig bug or working as intended? i915 seems to have a workaround, so I copied it from > > > there. Except it's currently missing select THERMAL, so I guess it didn't get updated when that got > > > added. > > > > > > ---->8 > > > Having nouveau builtin would still allow ACPI_VIDEO to be used as external module > > > if some of the deps for acpi_video have not been met, which would result in a linking > > > failure. Solve this by selecting all dependencies as well. > > > > > > Signed-off-by: Maarten Lankhorst > > > > Yep, this takes care of all deps, > > > > Tested-by: Borislav Petkov > > Just to check whether anyone has picked this already - it is triggering > on 3.8 too so it most probably needs a stable tag too. Ok, this is not good. So we have -rc7+, this patch has been out there for 2 months and still not in Linus' tree. Linus, the patch below fixes a build failure here with my custom config. I think this late in the game, we need some kind of a fix before 3.9 is released. I'm adding the patch here in case you want to pick it up yourself. Thanks. --- From: Maarten Lankhorst Date: Wed, 17 Apr 2013 12:04:09 +0200 Subject: [PATCH] drm/nouveau: always select ACPI_VIDEO if ACPI is enabled. Having nouveau builtin would still allow ACPI_VIDEO to be used as external module if some of the deps for acpi_video have not been met, which would result in a linking failure. Solve this by selecting all dependencies as well. Signed-off-by: Maarten Lankhorst Tested-by: Borislav Petkov --- drivers/gpu/drm/nouveau/Kconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index a7ff6d5a34b9..845b7caa9ee1 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -10,11 +10,17 @@ config DRM_NOUVEAU select FB 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 X86_PLATFORM_DEVICES if ACPI && X86 select ACPI_WMI if ACPI && X86 select MXM_WMI if ACPI && X86 select POWER_SUPPLY + # Similar to i915, we need to select ACPI_VIDEO and it's dependencies + select BACKLIGHT_LCD_SUPPORT if ACPI && X86 + select BACKLIGHT_CLASS_DEVICE if ACPI && X86 + select VIDEO_OUTPUT_CONTROL if ACPI && X86 + select INPUT if ACPI && X86 + select THERMAL if ACPI && X86 + select ACPI_VIDEO if ACPI && X86 help Choose this option for open-source nVidia support.