From patchwork Fri Oct 9 01:30:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 52633 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 n991SCld002178 for ; Fri, 9 Oct 2009 01:32:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757248AbZJIBcG (ORCPT ); Thu, 8 Oct 2009 21:32:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753445AbZJIBcG (ORCPT ); Thu, 8 Oct 2009 21:32:06 -0400 Received: from mga02.intel.com ([134.134.136.20]:60351 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757248AbZJIBcF (ORCPT ); Thu, 8 Oct 2009 21:32:05 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 08 Oct 2009 18:16:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,528,1249282800"; d="scan'208";a="557889856" Received: from rzhang-dt.sh.intel.com (HELO [10.239.36.145]) ([10.239.36.145]) by orsmga001.jf.intel.com with ESMTP; 08 Oct 2009 18:30:28 -0700 Subject: Re: Less strict requirements for video device detection (v3) From: Zhang Rui To: Stefan Bader Cc: "linux-acpi@vger.kernel.org" , Matthew Garrett , "lenb@kernel.org" In-Reply-To: <4AC3BE3B.7020304@canonical.com> 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> <4AC3BE3B.7020304@canonical.com> Date: Fri, 09 Oct 2009 09:30:29 +0800 Message-Id: <1255051829.2656.2.camel@rzhang-dt> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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;