From patchwork Thu Jul 18 05:40:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Gnatenko X-Patchwork-Id: 2829402 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A312C0AB2 for ; Thu, 18 Jul 2013 05:57:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65A02201B7 for ; Thu, 18 Jul 2013 05:57:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 99DDF201B5 for ; Thu, 18 Jul 2013 05:57:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 90845E66F3 for ; Wed, 17 Jul 2013 22:57:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C0EAE5CE4; Wed, 17 Jul 2013 22:40:20 -0700 (PDT) Received: by mail-la0-f54.google.com with SMTP id ec20so2102606lab.41 for ; Wed, 17 Jul 2013 22:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:mime-version:content-transfer-encoding; bh=WI9piB6vt93OWBdAPMap39WEnhXa7BB3aAYbmg22DGw=; b=X0B0au2iMk7wv1dv0SxafdHeC//7mKEuMqVCLAbKiEqeeYEv59YkezdEWSNgh0aPEe sIdJI45XRetRzlBaRbRAA39+fHSxxieWSAtoi1nMJ8wntRLcE7EV/khFP+aIeTsYFd9b 3xK75OsULW1YXBCfNglq7nDGqyM4HHxpQ7xgExMoavr/1zUW9V53/mJdXttO6o0iiUdG v/GExzmQiCUSeERLDn3tJ/1l46OBRtbKApjLeUnp4mUqC86cFemAEiMD5gVIM6m8vF80 +OxInwp3Tpw2syEzcp0fZ7TyonKyFgpAdhtmSjQwKO9sC9hRRFK3og9dsMQXnEzceGjW Of6g== X-Received: by 10.112.20.66 with SMTP id l2mr4621316lbe.48.1374126019103; Wed, 17 Jul 2013 22:40:19 -0700 (PDT) Received: from [192.168.254.26] ([176.192.161.180]) by mx.google.com with ESMTPSA id m1sm3494817lag.3.2013.07.17.22.40.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 22:40:18 -0700 (PDT) Message-ID: <1374126011.6123.2.camel@ThinkPad-X230.localdomain> Subject: Re: [PATCH 2/3] ACPI / video: Always call acpi_video_init_brightness() on init From: Igor Gnatenko To: "Rafael J. Wysocki" Date: Thu, 18 Jul 2013 09:40:11 +0400 In-Reply-To: <2754766.4uAbGBBbb8@vostro.rjw.lan> References: <1370818899-8595-1-git-send-email-matthew.garrett@nebula.com> <1448863.3slS729B6b@vostro.rjw.lan> <2754766.4uAbGBBbb8@vostro.rjw.lan> X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) Mime-Version: 1.0 X-Mailman-Approved-At: Wed, 17 Jul 2013 22:48:02 -0700 Cc: Matthew Garrett , seth.forshee@canonical.com, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Yves-Alexis Perez , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Lee, Chun-Yi" , linux-acpi@vger.kernel.org, joeyli.kernel@gmail.com, Henrique de Moraes Holschuh , Aaron Lu , lenb@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Garrett We have to call acpi_video_init_brightness() even if we're not going to initialise the backlight - Thinkpads seem to use this as the trigger for enabling ACPI notifications rather than handling it in firmware. [rjw: Drop the brightness object created by acpi_video_init_brightness() if we are not going to use it.] Signed-off-by: Matthew Garrett Signed-off-by: Rafael J. Wysocki Tested-by: Igor Gnatenko --- drivers/acpi/video.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Index: linux-pm/drivers/acpi/video.c =================================================================== --- linux-pm.orig/drivers/acpi/video.c +++ linux-pm/drivers/acpi/video.c @@ -884,6 +884,9 @@ static void acpi_video_device_find_cap(s if (acpi_has_method(device->dev->handle, "_DDC")) device->cap._DDC = 1; + if (acpi_video_init_brightness(device)) + return; + if (acpi_video_backlight_support()) { struct backlight_properties props; struct pci_dev *pdev; @@ -893,9 +896,6 @@ static void acpi_video_device_find_cap(s static int count = 0; char *name; - result = acpi_video_init_brightness(device); - if (result) - return; name = kasprintf(GFP_KERNEL, "acpi_video%d", count); if (!name) return; @@ -955,6 +955,11 @@ static void acpi_video_device_find_cap(s if (result) printk(KERN_ERR PREFIX "Create sysfs link\n"); + } else { + /* Remove the brightness object. */ + kfree(device->brightness->levels); + kfree(device->brightness); + device->brightness = NULL; } }