From patchwork Thu May 16 04:01:48 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: 2575071 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 25EB6DFB7B for ; Thu, 16 May 2013 04:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750767Ab3EPEFH (ORCPT ); Thu, 16 May 2013 00:05:07 -0400 Received: from mail-oa0-f43.google.com ([209.85.219.43]:64362 "EHLO mail-oa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751866Ab3EPEFD (ORCPT ); Thu, 16 May 2013 00:05:03 -0400 Received: by mail-oa0-f43.google.com with SMTP id o6so3185242oag.30 for ; Wed, 15 May 2013 21:05:02 -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:in-reply-to :references; bh=GZ0C7CTHJ1cXPf9gOdHeVXiQ546l7rVPKnf6LEv4N3E=; b=RnT3bxggxfGiR2hAUR0iYY6yh4m0YAW5XwiPjgWbyFupvWOCnN+TclyGgAFWZc5YGv 6DSKdP486nTzuDCfyDJpt9PZNMwLa6MZneoOW1letzVLuGA4eL/v8sZ6phiPARvmbXKt HwbrTOJAeEE5tphrJHE4I1NyRxK+JS9FdsSGnGahZxzcnITiw6Ujow85E/bkpysoRpMj 5JI6wfvMfCOjJniB1mnl3QBLm4suZYnB0AAOR+Cbf1EIisb/DafkupWN1Ot2TxJRSnBn asV3pwe+v6QdypZXI2LbjFwxqLjZ3XdEHImbyQwRvBZr7CSEkrXNjf/NGS+38eiO0+b7 DyHg== X-Received: by 10.182.165.131 with SMTP id yy3mr10806132obb.36.1368677102351; Wed, 15 May 2013 21:05:02 -0700 (PDT) Received: from localhost.localdomain ([130.57.30.250]) by mx.google.com with ESMTPSA id jw8sm6228164obb.14.2013.05.15.21.04.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 May 2013 21:05:01 -0700 (PDT) From: "Lee, Chun-Yi" To: rui.zhang@intel.com, 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" , Len Brown , Carlos Corbacho , Dmitry Torokhov , Corentin Chary , Aaron Lu , Thomas Renninger Subject: [PATCH v2 2/2] acer-wmi: add Acer Aspire 5750G to video vendor list but keep acpi video driver Date: Thu, 16 May 2013 12:01:48 +0800 Message-Id: <1368676908-17274-2-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1368676908-17274-1-git-send-email-jlee@suse.com> References: <1368676908-17274-1-git-send-email-jlee@suse.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 v2: changed the information statement of keeping acpi video driver. Tested-by: Andrzej Krentosz Cc: Zhang Rui Cc: Len Brown 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..a81c9ed 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("Keeping acpi video driver active to emit backlight brightness change key events\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();