From patchwork Sun Jul 11 00:30:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 111258 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6B0TgrB028667 for ; Sun, 11 Jul 2010 00:31:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753859Ab0GKAbF (ORCPT ); Sat, 10 Jul 2010 20:31:05 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:47554 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789Ab0GKAbE (ORCPT ); Sat, 10 Jul 2010 20:31:04 -0400 Received: by pwi5 with SMTP id 5so1350657pwi.19 for ; Sat, 10 Jul 2010 17:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=gNvKV7OKI/8JJS1z+w4rh3+CRpSeTV36+1AGrMvXrOg=; b=YRBr5lRMFuzrNElKaw+42sV7iQ6q4VMz3Dj8cS3rIuEeMgKGGjkvyIGTGInEv0YA/A UMnx2PuySKsgz2duQ/8dPZ0tzMiMX11ioWiFjP7ZeLhTxXpHdYPzZY5UTGuP6e9QbnRA oGt8eQAZI+k33TFlr6FSNw2Kz1LxE7LUXts/o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=hSRRN1MKJviGX/o3WTiZAn2JIe5YWNraGTS2zaJLwM+XhaFOgh+5/JNJs/criNxYVa dhpZ4UtkyoaYojF9AAtHPEGktPMHfgp6LdkdlxbxNPz8HnNIBvUR4Tfd/kNXm1yLmtwq /SZkvxabytmhL2OymMM4GMpBtcWx2dErr2N/k= Received: by 10.142.141.20 with SMTP id o20mr1361377wfd.194.1278808262344; Sat, 10 Jul 2010 17:31:02 -0700 (PDT) Received: from localhost.localdomain (124-11-22-254.dynamic.tfn.net.tw [124.11.22.254]) by mx.google.com with ESMTPS id t11sm2940630wfc.4.2010.07.10.17.31.00 (version=SSLv3 cipher=RC4-MD5); Sat, 10 Jul 2010 17:31:01 -0700 (PDT) From: "Lee, Chun-Yi" To: linux-kernel@vger.kernel.org Cc: mjg@redhat.com, gregkh@suse.de, jlee@novell.com, Dennis.Jansen@web.de, linux-acpi@vger.kernel.org Subject: [PATCH] Add intel drm blacklist to intel_opregion_present detect Date: Sun, 11 Jul 2010 08:30:44 +0800 Message-Id: <1278808244-6547-1-git-send-email-jlee@novell.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 11 Jul 2010 00:31:06 +0000 (UTC) There have some machines not support by i915 drm driver, e.g. MSI U110/U150, there are use poulsbo chip and drm driver not support it because legal issue. Those machines's acpi backlight control actually work fine and don't need apply the intel opregion support. So, add intel drm blacklist to intel_opregion_present, it can enable the acpi brightness interface but not use intel opregion. Signed-off-by: Lee, Chun-Yi --- drivers/acpi/video.c | 17 ++++++++++++++++- include/linux/pci_ids.h | 1 + 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 9865d46..25a70e0 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -88,6 +88,11 @@ static int acpi_video_bus_add(struct acpi_device *device); static int acpi_video_bus_remove(struct acpi_device *device, int type); static void acpi_video_bus_notify(struct acpi_device *device, u32 event); +static const struct pci_device_id intel_drm_blacklist[] = { + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_VGA) }, + { } /* Terminating entry */ +}; + static const struct acpi_device_id video_device_ids[] = { {ACPI_VIDEO_HID, 0}, {"", 0}, @@ -2531,8 +2536,11 @@ static int __init intel_opregion_present(void) #if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE) struct pci_dev *dev = NULL; u32 address; + int i; + bool in_blacklist; for_each_pci_dev(dev) { + in_blacklist = 0; if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA) continue; if (dev->vendor != PCI_VENDOR_ID_INTEL) @@ -2540,7 +2548,14 @@ static int __init intel_opregion_present(void) pci_read_config_dword(dev, 0xfc, &address); if (!address) continue; - return 1; + for (i = 0; intel_drm_blacklist[i].device != 0; i++) { + if (dev->device == intel_drm_blacklist[i].device) { + in_blacklist = 1; + break; + } + } + if (!in_blacklist) + return 1; } #endif return 0; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3bedcc1..78858b1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2669,6 +2669,7 @@ #define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 #define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 +#define PCI_DEVICE_ID_INTEL_SCH_VGA 0x8108 #define PCI_DEVICE_ID_INTEL_SCH_LPC 0x8119 #define PCI_DEVICE_ID_INTEL_SCH_IDE 0x811a #define PCI_DEVICE_ID_INTEL_82454GX 0x84c4