From patchwork Fri Nov 26 09:40:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 73163 X-Patchwork-Delegate: brad.figg@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id BAD8DB70DF for ; Fri, 26 Nov 2010 20:40:48 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PLunA-0002ga-Jd; Fri, 26 Nov 2010 09:40:32 +0000 Received: from mail-iw0-f177.google.com ([209.85.214.177]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PLun9-0002gV-9q for kernel-team@lists.ubuntu.com; Fri, 26 Nov 2010 09:40:31 +0000 Received: by iwn36 with SMTP id 36so615911iwn.8 for ; Fri, 26 Nov 2010 01:40:30 -0800 (PST) Received: by 10.231.156.1 with SMTP id u1mr1191235ibw.162.1290764430557; Fri, 26 Nov 2010 01:40:30 -0800 (PST) Received: from localhost ([210.242.151.101]) by mx.google.com with ESMTPS id 34sm1860588ibi.2.2010.11.26.01.40.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 26 Nov 2010 01:40:29 -0800 (PST) From: Keng-Yu Lin To: kernel-team@lists.ubuntu.com Subject: [Maverick SRU] UBUNTU: [Upstream] Call acpi_video_register() in intel_opregion_init() failure path Date: Fri, 26 Nov 2010 17:40:26 +0800 Message-Id: <1290764426-5299-1-git-send-email-keng-yu.lin@canonical.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch gets merged in 2.6.36. Since the last stable release of 2.6.35.9 is out. This patch may be included as an SRU in Ubuntu. SRU Justification: Impact: The backlight brightness of laptop type Toshiba NB305 cannot be adjusted. Fix: Call acpi_video_register() on the failure path. Testcase: Cameron Matheson verified on Toshiba NB305. David Woodhouse verified on Lenovo IdeaPad S10-3 Acked-by: Tim Gardner Acked-by: Stefan Bader --- From 89dcb83236bb656f7e9eaa75b53c5783ff0b8418 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 13 Aug 2010 00:56:54 +0100 Subject: [Maverick SRU] UBUNTU: [Upstream] Call acpi_video_register() in intel_opregion_init() failure path BugLink: http://bugs.launchpad.net/bugs/615947 upstream commit: 54b9b308fa39e5147e2edde3492d8650b957be6c If i915 opregion is present, the acpi_video driver doesn't register itself immediately; it defers that until the i915 opregion code is done. But if that *fails*, the acpi_video driver was never getting registered. And thus I have no backlight support on my Lenovo IdeaPad S10-3. Call acpi_video_register() on the failure path, and it works again. Signed-off-by: David Woodhouse Acked-by: Jesse Barnes Acked-by: Matthew Garrett Tested-by: Cameron Matheson Signed-off-by: Keng-Yu Lin --- drivers/gpu/drm/i915/i915_opregion.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 8fcc75c..d1bf92b 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c @@ -535,6 +535,7 @@ int intel_opregion_init(struct drm_device *dev, int resume) err_out: iounmap(opregion->header); opregion->header = NULL; + acpi_video_register(); return err; }