From patchwork Wed Sep 30 20:23:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 50753 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8UKNS0u029334 for ; Wed, 30 Sep 2009 20:23:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752519AbZI3UXR (ORCPT ); Wed, 30 Sep 2009 16:23:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752612AbZI3UXR (ORCPT ); Wed, 30 Sep 2009 16:23:17 -0400 Received: from adelie.canonical.com ([91.189.90.139]:39420 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752519AbZI3UXQ (ORCPT ); Wed, 30 Sep 2009 16:23:16 -0400 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Mt5hn-0001pZ-Qi; Wed, 30 Sep 2009 21:23:19 +0100 Received: from p5b2e4121.dip.t-dialin.net ([91.46.65.33] helo=[192.168.2.105]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Mt5hn-0005qP-M2; Wed, 30 Sep 2009 21:23:19 +0100 Message-ID: <4AC3BE3B.7020304@canonical.com> Date: Wed, 30 Sep 2009 22:23:23 +0200 From: Stefan Bader User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: Zhang Rui CC: "linux-acpi@vger.kernel.org" , Matthew Garrett , lenb@kernel.org Subject: Re: Less strict requirements for video device detection (v3) References: <4A8D140F.1090909@canonical.com> <1250817458.17853.141.camel@rzhang-dt> <4A8E7022.8000707@canonical.com> <1251076781.3483.13.camel@rzhang-dt> <4A92A73C.7010003@canonical.com> <1251162484.3483.51.camel@rzhang-dt> In-Reply-To: <1251162484.3483.51.camel@rzhang-dt> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From dbd8ac9a49a1b11eb7c5a49cfd44a93f1a5dd921 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Fri, 21 Aug 2009 11:03:05 +0200 Subject: [PATCH] acpi: video: Loosen strictness of video bus detection code BugLink: http://bugs.launchpad.net/bugs/333386 Currently a video bus device must (beside other criteria) define _DOD and _DOS methods to be considered a video device. Some broken BIOSes prevented working backlight control by only defining both for one (non-existing bus) and only _DOD for the rest. With this patch in place the other bus definitions were considered too and backlight control started to work again. Signed-off-by: Stefan Bader Acked-by: Zhang Rui --- drivers/acpi/video.c | 7 ++++++- drivers/acpi/video_detect.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index a4fddb2..518910e 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1109,7 +1109,12 @@ static int acpi_video_bus_check(struct acpi_video_bus *video) */ /* Does this device support video switching? */ - if (video->cap._DOS) { + if (video->cap._DOS || video->cap._DOD) { + if (!video->cap._DOS) { + printk(KERN_WARNING FW_BUG + "ACPI(%s) defines _DOD but not _DOS\n", + acpi_device_bid(video->device)); + } video->flags.multihead = 1; status = 0; } diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 7032f25..575593a 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -84,7 +84,7 @@ long acpi_is_video_device(struct acpi_device *device) return 0; /* Does this device able to support video switching ? */ - if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) && + if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) || ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING; -- 1.5.4.3