From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756748AbcKETYJ (ORCPT ); Sat, 5 Nov 2016 15:24:09 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:49313 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756651AbcKETYF (ORCPT ); Sat, 5 Nov 2016 15:24:05 -0400 Date: Sat, 5 Nov 2016 12:25:36 -0700 From: Darren Hart To: Lyude Cc: ibm-acpi-devel@lists.sourceforge.net, Daniel Martin , Henrique de Moraes Holschuh , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3 v3] thinkpad_acpi: Add support for X1 Yoga (2016) Tablet Mode Message-ID: <20161105192536.GG100528@f23x64.localdomain> References: <1477954535-12536-1-git-send-email-lyude@redhat.com> <1477954535-12536-4-git-send-email-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477954535-12536-4-git-send-email-lyude@redhat.com> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 31, 2016 at 06:55:34PM -0400, Lyude wrote: > For whatever reason, the X1 Yoga doesn't support the normal method of > querying for tablet mode. Instead of providing the MHKG method under the > hotkey handle, we're instead given the CMMD method under the EC handle. > Values on this handle are either 0x1, laptop mode, or 0x6, tablet mode. > > Changes since v1: > - Clarify kernel output when finding the tablet mode switch > Changes since v2: > - Rebase on top of previous patch > - Use an enum for hotkey_tablet. This does make a bit more sense then > just adding another flag. > - Call hotkey_tablet_mode_notify_change() when getting TABLET_CHANGED > event. These go below the --- > > Cc: Daniel Martin > Signed-off-by: Lyude > --- > drivers/platform/x86/thinkpad_acpi.c | 37 ++++++++++++++++++++++++++++++++---- > 1 file changed, 33 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index 92e8986..4df4153 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -190,6 +190,9 @@ enum tpacpi_hkey_event_t { > TP_HKEY_EV_LID_OPEN = 0x5002, /* laptop lid opened */ > TP_HKEY_EV_TABLET_TABLET = 0x5009, /* tablet swivel up */ > TP_HKEY_EV_TABLET_NOTEBOOK = 0x500a, /* tablet swivel down */ > + TP_HKEY_EV_TABLET_CHANGED = 0x60c0, /* X1 Yoga (2016): > + * enter/leave tablet mode > + */ > TP_HKEY_EV_PEN_INSERTED = 0x500b, /* tablet pen inserted */ > TP_HKEY_EV_PEN_REMOVED = 0x500c, /* tablet pen removed */ > TP_HKEY_EV_BRGHT_CHANGED = 0x5010, /* backlight control event */ > @@ -305,6 +308,7 @@ static struct { > enum { > TP_HOTKEY_TABLET_NONE = 0, > TP_HOTKEY_TABLET_USES_MHKG = 1, > + TP_HOTKEY_TABLET_USES_CMMD = 2, 1 and 2 will follow automatically, no need to specify. Pending Henrique's preference on inline enum or external definition. > } hotkey_tablet; > u32 kbdlight:1; > u32 light:1; > @@ -2062,6 +2066,8 @@ static void hotkey_poll_setup(const bool may_warn); > > /* HKEY.MHKG() return bits */ > #define TP_HOTKEY_TABLET_MASK (1 << 3) > +/* ThinkPad X1 Yoga (2016) */ > +#define TP_EC_CMMD_TABLET_MODE 0x6 > > static int hotkey_get_wlsw(void) > { > @@ -2086,10 +2092,23 @@ static int hotkey_get_tablet_mode(int *status) > { > int s; > > - if (!acpi_evalf(hkey_handle, &s, "MHKG", "d")) > - return -EIO; > + switch (tp_features.hotkey_tablet) { > + case TP_HOTKEY_TABLET_USES_MHKG: > + if (!acpi_evalf(hkey_handle, &s, "MHKG", "d")) > + return -EIO; > + > + *status = ((s & TP_HOTKEY_TABLET_MASK) != 0); > + break; > + case TP_HOTKEY_TABLET_USES_CMMD: > + if (!acpi_evalf(ec_handle, &s, "CMMD", "d")) > + return -EIO; > + > + *status = (s == TP_EC_CMMD_TABLET_MODE); > + break; > + default: > + break; > + } > > - *status = ((s & TP_HOTKEY_TABLET_MASK) != 0); > return 0; > } > > @@ -3127,10 +3146,14 @@ hotkey_init_tablet_mode(void) > char *type; > bool in_tablet_mode; > > - /* For X41t, X60t, X61t Tablets... */ > if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) { > + /* For X41t, X60t, X61t Tablets... */ > tp_features.hotkey_tablet = TP_HOTKEY_TABLET_USES_MHKG; > type = "MHKG"; > + } else if (acpi_evalf(ec_handle, &res, "CMMD", "qd")) { > + /* For X1 Yoga (2016) */ > + tp_features.hotkey_tablet = TP_HOTKEY_TABLET_USES_CMMD; > + type = "CMMD"; > } > > if (!tp_features.hotkey_tablet) > @@ -3928,6 +3951,12 @@ static bool hotkey_notify_6xxx(const u32 hkey, > *ignore_acpi_ev = true; > return true; > > + case TP_HKEY_EV_TABLET_CHANGED: > + tpacpi_input_send_tabletsw(); > + hotkey_tablet_mode_notify_change(); > + *send_acpi_ev = false; > + break; > + > default: > pr_warn("unknown possible thermal alarm or keyboard event received\n"); > known = false; > -- > 2.7.4 > > -- Darren Hart Intel Open Source Technology Center