platform/x86: asus-wmi: Add support for ROG X13 tablet mode

Add quirk for ASUS ROG X13 Flow 2-in-1 to enable tablet mode with
lid flip (all screen rotations).

Signed-off-by: Luke D. Jones <luke@ljones.dev>
Link: https://lore.kernel.org/r/20220813092753.6635-2-luke@ljones.dev
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 4672a2b8322e34069927e8a060e7f38abed36577..d9e7cf6e4a0e1e8ce400386982802796ca548e82 100644 (file)
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -123,6 +123,11 @@ static struct quirk_entry quirk_asus_use_lid_flip_devid = {
        .tablet_switch_mode = asus_wmi_lid_flip_devid,
 };
 
+static struct quirk_entry quirk_asus_tablet_mode = {
+       .wmi_backlight_set_devstate = true,
+       .tablet_switch_mode = asus_wmi_lid_flip_rog_devid,
+};
+
 static int dmi_matched(const struct dmi_system_id *dmi)
 {
        pr_info("Identified laptop model '%s'\n", dmi->ident);
@@ -471,6 +476,15 @@ static const struct dmi_system_id asus_quirks[] = {
                },
                .driver_data = &quirk_asus_use_lid_flip_devid,
        },
+       {
+               .callback = dmi_matched,
+               .ident = "ASUS ROG FLOW X13",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GV301Q"),
+               },
+               .driver_data = &quirk_asus_tablet_mode,
+       },
        {},
 };
 
@@ -578,6 +592,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
        { KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
        { KE_IGNORE, 0xC6, },  /* Ambient Light Sensor notification */
        { KE_KEY, 0xFA, { KEY_PROG2 } },           /* Lid flip action */
+       { KE_KEY, 0xBD, { KEY_PROG2 } },           /* Lid flip action on ROG xflow laptops */
        { KE_END, 0},
 };
 

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index fe2d072e1acc16b1bc42b7c3cf03e5a7470bf7af..5352055848d0cf2b98fa2cdc23e5921981aca7e3 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -68,6 +68,7 @@ module_param(fnlock_default, bool, 0444);
 #define NOTIFY_KBD_FBM                 0x99
 #define NOTIFY_KBD_TTP                 0xae
 #define NOTIFY_LID_FLIP                        0xfa
+#define NOTIFY_LID_FLIP_ROG            0xbd
 
 #define ASUS_WMI_FNLOCK_BIOS_DISABLED  BIT(0)
 
@@ -530,6 +531,19 @@ static int asus_wmi_input_init(struct asus_wmi *asus)
                        dev_err(dev, "Error checking for lid-flip: %d\n", result);
                }
                break;
+       case asus_wmi_lid_flip_rog_devid:
+               result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_LID_FLIP_ROG);
+               if (result < 0)
+                       asus->driver->quirks->tablet_switch_mode = asus_wmi_no_tablet_switch;
+               if (result >= 0) {
+                       input_set_capability(asus->inputdev, EV_SW, SW_TABLET_MODE);
+                       input_report_switch(asus->inputdev, SW_TABLET_MODE, result);
+               } else if (result == -ENODEV) {
+                       dev_err(dev, "This device has lid-flip-rog quirk but got ENODEV checking it. This is a bug.");
+               } else {
+                       dev_err(dev, "Error checking for lid-flip: %d\n", result);
+               }
+               break;
        }
 
        err = input_register_device(asus->inputdev);
@@ -564,6 +578,17 @@ static void lid_flip_tablet_mode_get_state(struct asus_wmi *asus)
        }
 }
 
+static void lid_flip_rog_tablet_mode_get_state(struct asus_wmi *asus)
+{
+       int result;
+
+       result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_LID_FLIP_ROG);
+       if (result >= 0) {
+               input_report_switch(asus->inputdev, SW_TABLET_MODE, result);
+               input_sync(asus->inputdev);
+       }
+}
+
 /* dGPU ********************************************************************/
 static ssize_t dgpu_disable_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
@@ -3069,6 +3094,12 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
                return;
        }
 
+       if (asus->driver->quirks->tablet_switch_mode == asus_wmi_lid_flip_rog_devid &&
+           code == NOTIFY_LID_FLIP_ROG) {
+               lid_flip_rog_tablet_mode_get_state(asus);
+               return;
+       }
+
        if (asus->fan_boost_mode_available && code == NOTIFY_KBD_FBM) {
                fan_boost_mode_switch_next(asus);
                return;
@@ -3701,6 +3732,9 @@ static int asus_hotk_resume(struct device *device)
        case asus_wmi_lid_flip_devid:
                lid_flip_tablet_mode_get_state(asus);
                break;
+       case asus_wmi_lid_flip_rog_devid:
+               lid_flip_rog_tablet_mode_get_state(asus);
+               break;
        }
 
        return 0;
@@ -3749,6 +3783,9 @@ static int asus_hotk_restore(struct device *device)
        case asus_wmi_lid_flip_devid:
                lid_flip_tablet_mode_get_state(asus);
                break;
+       case asus_wmi_lid_flip_rog_devid:
+               lid_flip_rog_tablet_mode_get_state(asus);
+               break;
        }
 
        return 0;

diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index 413920bad0c61eec04921da087ec2b74574a5af0..0187f13d241486c0dd4912d341cd72ec3e87cbd1 100644 (file)
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -29,6 +29,7 @@ enum asus_wmi_tablet_switch_mode {
        asus_wmi_no_tablet_switch,
        asus_wmi_kbd_dock_devid,
        asus_wmi_lid_flip_devid,
+       asus_wmi_lid_flip_rog_devid,
 };
 
 struct quirk_entry {

diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 70d2347bf6ca3540052a74e33b3bf4081ed739be..6e8a95c10d17c96fe2116ac2db176b8478c36502 100644 (file)
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -65,6 +65,7 @@
 #define ASUS_WMI_DEVID_PANEL_OD                0x00050019
 #define ASUS_WMI_DEVID_CAMERA          0x00060013
 #define ASUS_WMI_DEVID_LID_FLIP                0x00060062
+#define ASUS_WMI_DEVID_LID_FLIP_ROG    0x00060077
 
 /* Storage */
 #define ASUS_WMI_DEVID_CARDREADER      0x00080013