From patchwork Wed Jul 26 13:53:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108761 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp828352qge; Wed, 26 Jul 2017 06:54:32 -0700 (PDT) X-Received: by 10.99.1.2 with SMTP id 2mr953293pgb.213.1501077271734; Wed, 26 Jul 2017 06:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501077271; cv=none; d=google.com; s=arc-20160816; b=up2osC9MlFEMj789NEfLYY4FpnY5kHpgEVAOKyfJuj/kMq1e+EkWTj9C4VrELvKb4k HjMmdhvgqblySo929es3GKjG6DIs69yAjWRewbcHdGM7Y3q2DIU1lFwR3iFDnUQoNWsn 4fP9cSy1xZP7Nu2PdaSXXYJiW6QEVv2gBO2I9bNvKvqbLynGzS/w2nfM/EfMkYA7Fv16 V57y3XopJArDhhB/VD3jTAfGpOAD/1Hwycp832C+TVwlXsndGZ0EOJB/IhHPLlu0eIHy SVq5oVrlNJAZeIet5XyjmhacidtYgmJAd+gwqpB7Ns+PlVHMQ8ujMvVDe2LuaoAKQuQ6 Ebxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:message-id:date :subject:to:from:delivered-to:arc-authentication-results; bh=R7UocglEy3YEV5B7GL74zvjMKoh/aH1kR3e5rzKjL34=; b=Hf7ocg4j7a99S0Zlxb5Q/UV2ofF0EkHTDZnts1AWcj71iPCLXw1uM4d8+AYynVyFB7 sH6J59jjNd7Mt83Bn0HztGumaMV3R2as0ec6so2XnnT6+pZRL8qcdYPL5lm1qRnBLdD2 2cXp1vsi1uzXavkGXvp7DQDRrKu0T+JBkreMHfXjNJdEyoEY6Updn8Lag8Zm9kslteXg FMVUPszzWXO+xoosZGILohtto5XBCY8+YgFiSyXiFAdtFM9CLnNl15wn4BiO/K1pwwJr Igvd1PgBKJ8VybFNI9QuWSd7HOyJQkXyK+aIBmwyJuKLJHATS1nrPQVT0O/Tg/waPUP0 0Teg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id a125si9771072pgc.79.2017.07.26.06.54.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jul 2017 06:54:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E1616E7A1; Wed, 26 Jul 2017 13:54:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83EA86E79F; Wed, 26 Jul 2017 13:53:58 +0000 (UTC) Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MCuUJ-1dSQPF17nn-009dMt; Wed, 26 Jul 2017 15:53:26 +0200 From: Arnd Bergmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] backlight: always select BACKLIGHT_LCD_SUPPORT for BACKLIGHT_CLASS_DEVICE Date: Wed, 26 Jul 2017 15:53:10 +0200 Message-Id: <20170726135312.2214309-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170726135312.2214309-1-arnd@arndb.de> References: <20170726135312.2214309-1-arnd@arndb.de> X-Provags-ID: V03:K0:QvR/cXLZvrvdaTQnSNVuAR59ltdoS1shdkE1TJ5B6hkPeuWy29K H0tWTFyoWxoOVyUFCxmG3vsmFv6j+OhHbLIUbfigP/JYrvG+JES/drGHLR0eX1rEVU9X9CE b83ULdV/S6Ort3Lb8ZEOZXSHKfNokYbDxkNO1F0gULOPTsPA1RiLYxnYZmA2rQ5mb64mTPw 0/DvOoViiT6P/gGhErb3w== X-UI-Out-Filterresults: notjunk:1; V01:K0:NRNBihWZBUQ=:trbsvD6TUnUx4m9Yr9Ulgj Uk4PL0M5xkpPeFnARA4LWXwCf5l2MP4ib+aWJzMJ5J1FBVdtX0osqmhSUk5WL5cAsqJiufBml TVkTzok4uFyBQRVaP1j+QjT0jOoBRSbAdMB1ESysekFFcuD3XqesXVUduZQlJ/Zs+ijPLM7ew WlSL8mNmtVTBQEJAbyvQLYaD+E6XRvAZQes6C6yh3hUM3ai3fwaylQxVdekn7cb8RjQqYBien yY/xQV3FD2UvYsvtro2mslOwf3DS3oHku9enrxtqKGE1WN32UsfsMfR00CqOW/5IBV3uTg+Kr Q2wBbwRU9keivMAsobgGCufNHKkiOdgFqDXBZmVAV9M6CzM5RfeBVdAaowFwM//CUE9jxU9ej fXcEGQ9ogyEgE5qVR+gfGXxMOWXpPUJPtNnCYdDkl45WGHqpdOKU+3hqTVZhSVWa9MFpnV1yl i8aTmfcliIxJlcnsBfLMmClOzzocbRfhTzy+8UJAp6Xpc1A5LX8OV+URaREVDtqMQiZNyxIgP O1z6dWHWcwt9cw1DBpVddGGDI4RNxsA9ELDpZWsnnbXzp1GOR88L9i2hd5NrdUxYFKvCT05hZ 1FvPUYE5NI2dPreThRua6hOddAt4/8bW7Mdqfuiws4rstIn0d6Bi33YCL5QEAUOlhrMvF9Lgj TbwnGYu4KskLS4B+czrsrz6s7KiGuLzAxVMqxnh4eDxsGAnxRhFymx6HX8QQtgJ90NNX1BXQg 4JHpfsxxg3aGIYXTp58x99eTjhmXk5tPgZuIUw== Cc: nouveau@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, Daniel Vetter , devel@driverdev.osuosl.org, Daniel Drake , Jens Frederich , linux-acpi@vger.kernel.org, Ben Skeggs , Russell King , Darren Hart , Len Brown , Arnd Bergmann , intel-gfx@lists.freedesktop.org, etnaviv@lists.freedesktop.org, Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Andy Shevchenko X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" randconfig builds occasionally produce this Kconfig warning: warning: (DRM_RADEON && DRM_AMDGPU && DRM_NOUVEAU && DRM_I915 && DRM_GMA500 && DRM_SHMOBILE && DRM_TILCDC && DRM_FSL_DCU && DRM_TINYDRM && DRM_PARADE_PS8622 && FB_BACKLIGHT && FB_ARMCLCD && FB_MX3 && USB_APPLEDISPLAY && FB_OLPC_DCON && ACPI_CMPC && SAMSUNG_Q10) selects BACKLIGHT_CLASS_DEVICE which has unmet direct dependencies (HAS_IOMEM && BACKLIGHT_LCD_SUPPORT) It turns out that amost all users of BACKLIGHT_CLASS_DEVICE also select BACKLIGHT_LCD_SUPPORT, but not all of them do. This makes the remaining ones behave like the others. It would probably be best to rework the way those two options related entirely, but for now this takes the simpler and safer approach to fix the warnings without introducing regressions. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/gma500/Kconfig | 1 + drivers/platform/x86/Kconfig | 2 ++ drivers/staging/olpc_dcon/Kconfig | 1 + 3 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index df11582f1efc..52d855cb0569 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -6,6 +6,7 @@ config DRM_GMA500 # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 select ACPI_VIDEO if ACPI select BACKLIGHT_CLASS_DEVICE if ACPI + select BACKLIGHT_LCD_SUPPORT if ACPI select INPUT if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 80b87954f6dd..e0ca673bf564 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -785,6 +785,7 @@ config ACPI_CMPC depends on RFKILL || RFKILL=n select INPUT select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_LCD_SUPPORT default n help Support for Intel Classmate PC ACPI devices, including some @@ -1000,6 +1001,7 @@ config SAMSUNG_Q10 tristate "Samsung Q10 Extras" depends on ACPI select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_LCD_SUPPORT ---help--- This driver provides support for backlight control on Samsung Q10 and related laptops, including Dell Latitude X200. diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig index d277f048789e..845f756886f0 100644 --- a/drivers/staging/olpc_dcon/Kconfig +++ b/drivers/staging/olpc_dcon/Kconfig @@ -4,6 +4,7 @@ config FB_OLPC_DCON depends on I2C depends on (GPIO_CS5535 || GPIO_CS5535=n) select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_LCD_SUPPORT ---help--- In order to support very low power operation, the XO laptop uses a secondary Display CONtroller, or DCON. This secondary controller From patchwork Wed Jul 26 13:53:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108762 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp828430qge; Wed, 26 Jul 2017 06:54:37 -0700 (PDT) X-Received: by 10.99.52.72 with SMTP id b69mr937031pga.240.1501077277328; Wed, 26 Jul 2017 06:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501077277; cv=none; d=google.com; s=arc-20160816; b=FDOGkzVeCOdxSUNFZbTfoG/8ctBpwkesdIUy59OcIRwdTKLy6YWfPFe30DrmtBstpt xNKz6QkSLKsipN/iQfNTkoY5IupgRZXH6AvECd2iIvJ22WST8yZU0vg7hp/7m7RdU4xe UzZUET/O5MDXvDwbHCf7WOAjL5D8rwso7+4/+VV4CeDsh8qPLncH6A0nI8Wt/Bo8oerA XA4WInzVZ7JVx9ez3Xy3wasSO/T78AIIgsa84O9tz3I/3z4ecSU4PbiFtw/XFlyAtn3O LeXVtwfPNrEKOGtrxCesFppGrvcllBuclJ5heWl0h9Ege4yKmMf1+GvhfuTzWWDkk5Vs qBvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:message-id:date :subject:to:from:delivered-to:arc-authentication-results; bh=A73xYWmJFcBXhTskRZ437BIYDp34y7xuff0A7cogXx4=; b=F2JVVt8AmbgfLNBQunGgUCZGPhW71PJynJhBiBAodR8ZbgjGJnn3TkYxSyfgt0nYTf NY1YLvfFQnxa723dRSfvBRuLAQFF39k4JF8N8lDueWecYzi61NrJXdSYXP4Ju+4if/zS wNpIRYLyfclDPz32VelndraUr0Jqut/EKi5Eg2DG/KUfKuWo/AWVG4aHILVkn66ysnFm 42CSKZkKZABahYE9IMX8u/QfWgLrvMaxxK0QZTpIWVTF3iHhULT3/HMtjO2+0jD0MWco X0l6Lcp/Vx0c1LQXjVM3H2Z8fYByAVtS0ynAveYZvcLwgTt08+A1VicvJZqircbDaArd noDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id i10si7936361pgp.130.2017.07.26.06.54.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jul 2017 06:54:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 451176E7CC; Wed, 26 Jul 2017 13:54:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 664E06E79F; Wed, 26 Jul 2017 13:53:59 +0000 (UTC) Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lfneo-1duaDd30mo-00pIhi; Wed, 26 Jul 2017 15:53:27 +0200 From: Arnd Bergmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] ACPI/DRM: rework ACPI_VIDEO Kconfig dependencies Date: Wed, 26 Jul 2017 15:53:11 +0200 Message-Id: <20170726135312.2214309-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170726135312.2214309-1-arnd@arndb.de> References: <20170726135312.2214309-1-arnd@arndb.de> X-Provags-ID: V03:K0:/10OLuYtk3dHTixAevVRNW8cie4gU7DHcKL9xtvtcGDVMyFRXAS qMAmMKaZku7VL+VAgQ0tQjHTLKdDMDR42oxzCaDJErzkOmQNmO2fyB4fxtvzzdgPqQ8BHlB seicoYVANDmoHyh8cvOd65sEnH1ve4CSYN+U3xbo+NviDol/Hy78Jyak0dVKoq1jVVUqBxG nscLfKs4KvrKrmtuA19YQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:zclKVdEQWTE=:Xqjhy62NQCNcvSNHq+OyMY DUIWMILp/XacJjnac8WEKRdYMjDgWu1f1h38CjC0SItk4wSvKuCTn1RC5boW52cBzVIa2bza6 SsXUQNOHk3bdK1tFkbSmcByPzKeWSHp1hv89HOUn7QAJltp7wH8Z7cZJrgbrhHikfpvJj7+FK EgdL7Ocu38FMWqnlIkE/xuDbJBaJozR9/fpCTx79YehXsKMIKwwNzWf/pk94x9RIjDaMOaJJZ OrAvgV535OyflkJoq+e3nlFvI9xKgdA+5LMXj2BejklbLNBrtLJzoelff/lWjKHZHnmvUtbHK 6+L9sgGAoOV1tGBFwM0vjYisnvgWBOhrLus1upQO4uNo1B/Kb8n2fLe0/PTUj6+ryAhm5FSlR JecUoHl1rT4r2ffdpuMp+AlsoO32D3UH+CwH+Q2PNz9usZfm4DQduXe3gT2odF9BpvNDZep9s F/EdPXdhQxE3ZV8iTIyHVfi7vTVOabiXu+AiMMsLFivTs8/g71VNxxk+EVGFVBH35BJGCOYDO edvY7qwTferZY3BhPU4g7myxTpd1uo47oZbO8Zzikql3qMrA1K0oHttE40il0dKKuXF9JshUe Ut0XxqbY3HZR9foVPiaZ0I6hmrQuF3eukB07i5rKZt2yV1ZhNN1rP7SRZdJ4Ckuf6dbWz6zxg ARACXQDtDMsd4cOZGqRITXeS69wjGwXSA1D7Ep9p+al1i/C2IME1VOcHgMNIUYTtlgUoBjVSX oPd6LLy85snCDpzIlMSf3Y923pf3RKsi4soEHw== Cc: nouveau@lists.freedesktop.org, platform-driver-x86@vger.kernel.org, Daniel Vetter , devel@driverdev.osuosl.org, Daniel Drake , Jens Frederich , linux-acpi@vger.kernel.org, Ben Skeggs , Russell King , Darren Hart , Len Brown , Arnd Bergmann , intel-gfx@lists.freedesktop.org, etnaviv@lists.freedesktop.org, Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Andy Shevchenko X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" ACPI_VIDEO keeps causing problems with circular Kconfig dependencies, as it depends on a couple of other symbols, and it gets selected by drivers that may end up being depending on others. This is an attempt to simplify this by changing all drivers that currently 'select ACPI_VIDEO' to use 'depends on'. This by itself simplifies the dependency lists for the other drivers. We make ACPI_VIDEO 'default y' to avoid having it turned off for 'make oldconfig' users. This should again be fine as x86 users will normally want this enabled and the option is not available elsewhere. I'm moving the 'select BACKLIGHT_CLASS_DEVICE/BACKLIGHT_LCD_SUPPORT' into ACPI_VIDEO as a further simplification, those were already selected by anything that selected ACPI_VIDEO before. Changing the INPUT dependency in ACPI_CMPC is necessary to avoid a circular dependency with X86_PLATFORM_DEVICES/NOUVEAU. Signed-off-by: Arnd Bergmann --- drivers/acpi/Kconfig | 5 ++++- drivers/gpu/drm/gma500/Kconfig | 6 +----- drivers/gpu/drm/i915/Kconfig | 7 +------ drivers/gpu/drm/nouveau/Kconfig | 10 ++-------- drivers/platform/x86/Kconfig | 6 ++---- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 1ce52f84dc23..a8f5a40e2914 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -182,9 +182,12 @@ config ACPI_BUTTON config ACPI_VIDEO tristate "Video" - depends on X86 && BACKLIGHT_CLASS_DEVICE + depends on X86 depends on INPUT select THERMAL + select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_LCD_SUPPORT + default y help This driver implements the ACPI Extensions For Display Adapters for integrated graphics devices on motherboard, as specified in diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index 52d855cb0569..41878bb05067 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -1,13 +1,9 @@ config DRM_GMA500 tristate "Intel GMA5/600 KMS Framebuffer" depends on DRM && PCI && X86 && MMU + depends on ACPI_VIDEO || !ACPI select DRM_KMS_HELPER select DRM_TTM - # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 - select ACPI_VIDEO if ACPI - select BACKLIGHT_CLASS_DEVICE if ACPI - select BACKLIGHT_LCD_SUPPORT if ACPI - select INPUT if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the Intel GMA500 ('Poulsbo') and other Intel IMG based graphics diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index e9e64e8e9765..22978c88c7bf 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -2,6 +2,7 @@ config DRM_I915 tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics" depends on DRM depends on X86 && PCI + depends on ACPI_VIDEO || !ACPI select INTEL_GTT select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular @@ -12,12 +13,6 @@ config DRM_I915 select DRM_PANEL select DRM_MIPI_DSI select RELAY - # i915 depends on ACPI_VIDEO when ACPI is enabled - # but for select to work, need to select ACPI_VIDEO's dependencies, ick - select BACKLIGHT_LCD_SUPPORT if ACPI - select BACKLIGHT_CLASS_DEVICE if ACPI - select INPUT if ACPI - select ACPI_VIDEO if ACPI select ACPI_BUTTON if ACPI select SYNC_FILE select IOSF_MBI diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index c02a13406a81..8ac61658cec1 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -1,21 +1,15 @@ config DRM_NOUVEAU tristate "Nouveau (NVIDIA) cards" depends on DRM && PCI && MMU + depends on ACPI_VIDEO || !(ACPI && X86) select FW_LOADER select DRM_KMS_HELPER select DRM_TTM - select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT - select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && INPUT + select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT && FB 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 INPUT if ACPI && X86 - select THERMAL if ACPI && X86 - select ACPI_VIDEO if ACPI && X86 select DRM_VM help Choose this option for open-source NVIDIA support. diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e0ca673bf564..2d9fb46a8d11 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -17,7 +17,7 @@ if X86_PLATFORM_DEVICES config ACER_WMI tristate "Acer WMI Laptop Extras" - depends on ACPI + depends on ACPI_VIDEO select LEDS_CLASS select NEW_LEDS depends on BACKLIGHT_CLASS_DEVICE @@ -26,8 +26,6 @@ config ACER_WMI depends on RFKILL || RFKILL = n depends on ACPI_WMI select INPUT_SPARSEKMAP - # Acer WMI depends on ACPI_VIDEO when ACPI is enabled - select ACPI_VIDEO if ACPI ---help--- This is a driver for newer Acer (and Wistron) laptops. It adds wireless radio and bluetooth control, and on some laptops, @@ -783,7 +781,7 @@ config ACPI_CMPC tristate "CMPC Laptop Extras" depends on ACPI depends on RFKILL || RFKILL=n - select INPUT + depends on INPUT select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_LCD_SUPPORT default n