Linux v4.16-rc3-245-g5d60e057d127
This commit is contained in:
Jeremy Cline
parent
4b0b1380a2
commit
5860e766a6
2
gitrev
2
gitrev
@ -1 +1 @@
|
||||
97ace515f01439d4cf6e898b4094040dc12d36e7
|
||||
5d60e057d127538113d8945ea87d916fccee93fe
|
||||
|
||||
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%global rcrev 3
|
||||
# The git snapshot level
|
||||
%define gitrev 3
|
||||
%define gitrev 4
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -602,9 +602,6 @@ Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch
|
||||
# CVE-2018-7273 rhbz 1547384 1547386
|
||||
Patch500: floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch
|
||||
|
||||
# Fix keyboard on Dell XPS 9360 https://patchwork.kernel.org/patch/10236253/
|
||||
Patch501: platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch
|
||||
|
||||
# 600 - Patches for improved Bay and Cherry Trail device support
|
||||
# Below patches are submitted upstream, awaiting review / merging
|
||||
|
||||
@ -1866,6 +1863,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Mar 02 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git4.1
|
||||
- Linux v4.16-rc3-245-g5d60e057d127
|
||||
|
||||
* Thu Mar 01 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git3.1
|
||||
- Linux v4.16-rc3-167-g97ace515f014
|
||||
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
From 7714f7a44a29a4e873d5acfd4c9549c87a4bb4e4 Mon Sep 17 00:00:00 2001
|
||||
From: Mario Limonciello <mario.limonciello@dell.com>
|
||||
Date: Thu, 22 Feb 2018 13:58:42 -0600
|
||||
Subject: [PATCH] platform/x86: Only activate tablet mode switch on 2-in-1's
|
||||
|
||||
Some laptops such as the XPS 9360 support the intel-vbtn INT33D6
|
||||
interface but don't initialize the bit that intel-vbtn uses to
|
||||
represent switching tablet mode.
|
||||
|
||||
By running this only on real 2-in-1's it shouldn't cause false
|
||||
positives.
|
||||
|
||||
Fixes: 30323fb6d5 ("Support tablet mode switch")
|
||||
Reported-by: Jeremy Cline <jeremy@jcline.org>
|
||||
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
|
||||
---
|
||||
drivers/platform/x86/intel-vbtn.c | 46 ++++++++++++++++++++++++---------------
|
||||
1 file changed, 29 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
|
||||
index b703d6f5b099..8173307d6bb1 100644
|
||||
--- a/drivers/platform/x86/intel-vbtn.c
|
||||
+++ b/drivers/platform/x86/intel-vbtn.c
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
+#include <linux/dmi.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/input/sparse-keymap.h>
|
||||
#include <linux/kernel.h>
|
||||
@@ -97,9 +98,35 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
|
||||
dev_dbg(&device->dev, "unknown event index 0x%x\n", event);
|
||||
}
|
||||
|
||||
-static int intel_vbtn_probe(struct platform_device *device)
|
||||
+static void detect_tablet_mode(struct platform_device *device)
|
||||
{
|
||||
+ const char *chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE);
|
||||
+ struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
|
||||
+ acpi_handle handle = ACPI_HANDLE(&device->dev);
|
||||
struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL };
|
||||
+ union acpi_object *obj;
|
||||
+ acpi_status status;
|
||||
+ int m;
|
||||
+
|
||||
+ if (!(chassis_type && strcmp(chassis_type, "31") == 0))
|
||||
+ goto out;
|
||||
+
|
||||
+ status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
|
||||
+ if (ACPI_FAILURE(status))
|
||||
+ goto out;
|
||||
+
|
||||
+ obj = vgbs_output.pointer;
|
||||
+ if (!(obj && obj->type == ACPI_TYPE_INTEGER))
|
||||
+ goto out;
|
||||
+
|
||||
+ m = !(obj->integer.value & TABLET_MODE_FLAG);
|
||||
+ input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
|
||||
+out:
|
||||
+ kfree(vgbs_output.pointer);
|
||||
+}
|
||||
+
|
||||
+static int intel_vbtn_probe(struct platform_device *device)
|
||||
+{
|
||||
acpi_handle handle = ACPI_HANDLE(&device->dev);
|
||||
struct intel_vbtn_priv *priv;
|
||||
acpi_status status;
|
||||
@@ -122,22 +149,7 @@ static int intel_vbtn_probe(struct platform_device *device)
|
||||
return err;
|
||||
}
|
||||
|
||||
- /*
|
||||
- * VGBS being present and returning something means we have
|
||||
- * a tablet mode switch.
|
||||
- */
|
||||
- status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
|
||||
- if (ACPI_SUCCESS(status)) {
|
||||
- union acpi_object *obj = vgbs_output.pointer;
|
||||
-
|
||||
- if (obj && obj->type == ACPI_TYPE_INTEGER) {
|
||||
- int m = !(obj->integer.value & TABLET_MODE_FLAG);
|
||||
-
|
||||
- input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- kfree(vgbs_output.pointer);
|
||||
+ detect_tablet_mode(device);
|
||||
|
||||
status = acpi_install_notify_handler(handle,
|
||||
ACPI_DEVICE_NOTIFY,
|
||||
--
|
||||
2.16.2
|
||||
|
||||
2
sources
2
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
|
||||
SHA512 (patch-4.16-rc3.xz) = fd7bbfd9ca423b06341ed83c86417443978d371ddf35987edfc3fcd75b674f24198913a7cab27cb3ff832ade52ae1feba5f9bff303bf6af7fbb64d517e730bb1
|
||||
SHA512 (patch-4.16-rc3-git3.xz) = 3e1b29da83a651144bc3876dc94f59641e0d66a7b7ee2feca71c7e05a7e2687659bdda3b95abe2120004b735094ce9ca9c0e7ea69092f2aa7243a9b7647018cc
|
||||
SHA512 (patch-4.16-rc3-git4.xz) = f1863d328e62745e02e15b1865bf20b9a06e1de66ffb2c48423d0e85a8943e9ff45a799db6eeed1a921d50199276a6f37e4e8765b525eed491eb4352e8de34d8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user