From patchwork Mon Apr 22 12:39:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 2471751 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 08C7ADF23A for ; Mon, 22 Apr 2013 12:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753842Ab3DVMka (ORCPT ); Mon, 22 Apr 2013 08:40:30 -0400 Received: from mail-ia0-f180.google.com ([209.85.210.180]:44546 "EHLO mail-ia0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753724Ab3DVMk1 (ORCPT ); Mon, 22 Apr 2013 08:40:27 -0400 Received: by mail-ia0-f180.google.com with SMTP id t29so2100145iag.25 for ; Mon, 22 Apr 2013 05:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=0qdn2cHJnNQdcrAy9HOfK4bCYCRckXBOW+CoKg9A4+M=; b=kOQy0qKns6xLT6sqK36BTQcctCsQq7CK/YDZi22yvRkcfYz5BP63Lj83MPiQnmDWLe AH9+6CDCmJySzicWCdfMt9xE7iwswRmRNvMpbv+HXoUk3t+Jjl5NBncEALNTo5vzJAOn Zq/RJL6OWgB19ibbZp5vX4XLJ2XgGhd2CFE52bSMcJ6Rvig7pUFSvw1UTWV2hV22CS+M tR2DZKzIDFEbCxlZYOtfXuR2sOUQNNQqByAswx+3lRrmWkC+TOokwfMMa0ug/MO17JYV JWQ7ToUEgBy8AfbkeltxQU9lYGu8zjfwT3quU3ikeBkLjct9xG13DjGVRifGLvVewRFI 8i5Q== X-Received: by 10.50.51.226 with SMTP id n2mr8034970igo.25.1366634426958; Mon, 22 Apr 2013 05:40:26 -0700 (PDT) Received: from localhost.localdomain ([130.57.30.250]) by mx.google.com with ESMTPS id wx2sm17066542igb.4.2013.04.22.05.40.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 05:40:25 -0700 (PDT) From: Chun-Yi Lee To: mjg@redhat.com, rjw@sisk.pl Cc: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , Carlos Corbacho , Dmitry Torokhov , Corentin Chary , Aaron Lu , Thomas Renninger Subject: [PATCH 2/2] acer-wmi: add Acer Aspire 5750G to video vendor list but keep acpi video driver Date: Mon, 22 Apr 2013 20:39:14 +0800 Message-Id: <1366634355-26482-1-git-send-email-jlee@suse.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 From: Lee, Chun-Yi After Andrzej's testing, we found the acpi backlight methods broken on Acer Aspire 5750G but the i915 backlight control works when we set to vendor mode. And, we still want to keep the acpi/video driver for transfer acpi event to key event but not unregister whole acpi/video driver. This patch introduced a new capability flag is ACER_CAP_KEEP_VIDEO_KEY, it indicates the machine works fine with acpi/video driver for key event but want to unregister the backlight interface of acpi/video. Reference: bko#35622 https://bugzilla.kernel.org/show_bug.cgi?id=35622 Tested-by: Andrzej Krentosz Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Cc: Rafael J. Wysocki Cc: Aaron Lu Cc: Thomas Renninger Signed-off-by: Lee, Chun-Yi --- drivers/platform/x86/acer-wmi.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index c9076bd..2a02409 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -207,6 +207,7 @@ struct hotkey_function_type_aa { #define ACER_CAP_BRIGHTNESS (1<<3) #define ACER_CAP_THREEG (1<<4) #define ACER_CAP_ACCEL (1<<5) +#define ACER_CAP_KEEP_VIDEO_KEY (1<<6) #define ACER_CAP_ANY (0xFFFFFFFF) /* @@ -539,6 +540,15 @@ static int video_set_backlight_video_vendor(const struct dmi_system_id *d) return 0; } +static int video_set_backlight_video_vendor_keep_acpi_video( + const struct dmi_system_id *d) +{ + video_set_backlight_video_vendor(d); + interface->capability |= ACER_CAP_KEEP_VIDEO_KEY; + pr_info("Keep acpi video driver for emit keycode against backlight change\n"); + return 0; +} + static const struct dmi_system_id video_vendor_dmi_table[] = { { .callback = video_set_backlight_video_vendor, @@ -572,6 +582,14 @@ static const struct dmi_system_id video_vendor_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"), }, }, + { + .callback = video_set_backlight_video_vendor_keep_acpi_video, + .ident = "Acer Aspire 5750G", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750G"), + }, + }, {} }; @@ -2228,6 +2246,8 @@ static int __init acer_wmi_init(void) if (acpi_video_backlight_support()) { interface->capability &= ~ACER_CAP_BRIGHTNESS; pr_info("Brightness must be controlled by acpi video driver\n"); + } else if (interface->capability & ACER_CAP_KEEP_VIDEO_KEY) { + acpi_video_backlight_unregister(); } else { pr_info("Disabling ACPI video driver\n"); acpi_video_unregister();