Commit 14c200b7 authored by Hans de Goede's avatar Hans de Goede Committed by Ilpo Järvinen

platform/x86: intel-vbtn: Fix missing tablet-mode-switch events

2 issues have been reported on the Dell Inspiron 7352:

1. Sometimes the tablet-mode-switch stops reporting tablet-mode
   change events.

   Add a "VBDL" call to notify_handler() to work around this.

2. Sometimes the tablet-mode is incorrect after suspend/resume

   Add a detect_tablet_mode() to resume() to fix this.
Reported-by: default avatarArnold Gozum <arngozum@gmail.com>
Closes: https://lore.kernel.org/platform-driver-x86/87271a74-c831-4eec-b7a4-1371d0e42471@gmail.com/Tested-by: default avatarArnold Gozum <arngozum@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20231204150601.46976-1-hdegoede@redhat.comReviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 3494a594
...@@ -73,10 +73,10 @@ struct intel_vbtn_priv { ...@@ -73,10 +73,10 @@ struct intel_vbtn_priv {
bool wakeup_mode; bool wakeup_mode;
}; };
static void detect_tablet_mode(struct platform_device *device) static void detect_tablet_mode(struct device *dev)
{ {
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev); struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
acpi_handle handle = ACPI_HANDLE(&device->dev); acpi_handle handle = ACPI_HANDLE(dev);
unsigned long long vgbs; unsigned long long vgbs;
acpi_status status; acpi_status status;
int m; int m;
...@@ -89,6 +89,8 @@ static void detect_tablet_mode(struct platform_device *device) ...@@ -89,6 +89,8 @@ static void detect_tablet_mode(struct platform_device *device)
input_report_switch(priv->switches_dev, SW_TABLET_MODE, m); input_report_switch(priv->switches_dev, SW_TABLET_MODE, m);
m = (vgbs & VGBS_DOCK_MODE_FLAG) ? 1 : 0; m = (vgbs & VGBS_DOCK_MODE_FLAG) ? 1 : 0;
input_report_switch(priv->switches_dev, SW_DOCK, m); input_report_switch(priv->switches_dev, SW_DOCK, m);
input_sync(priv->switches_dev);
} }
/* /*
...@@ -134,7 +136,7 @@ static int intel_vbtn_input_setup(struct platform_device *device) ...@@ -134,7 +136,7 @@ static int intel_vbtn_input_setup(struct platform_device *device)
priv->switches_dev->id.bustype = BUS_HOST; priv->switches_dev->id.bustype = BUS_HOST;
if (priv->has_switches) { if (priv->has_switches) {
detect_tablet_mode(device); detect_tablet_mode(&device->dev);
ret = input_register_device(priv->switches_dev); ret = input_register_device(priv->switches_dev);
if (ret) if (ret)
...@@ -198,6 +200,9 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) ...@@ -198,6 +200,9 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
autorelease = val && (!ke_rel || ke_rel->type == KE_IGNORE); autorelease = val && (!ke_rel || ke_rel->type == KE_IGNORE);
sparse_keymap_report_event(input_dev, event, val, autorelease); sparse_keymap_report_event(input_dev, event, val, autorelease);
/* Some devices need this to report further events */
acpi_evaluate_object(handle, "VBDL", NULL, NULL);
} }
/* /*
...@@ -352,7 +357,13 @@ static void intel_vbtn_pm_complete(struct device *dev) ...@@ -352,7 +357,13 @@ static void intel_vbtn_pm_complete(struct device *dev)
static int intel_vbtn_pm_resume(struct device *dev) static int intel_vbtn_pm_resume(struct device *dev)
{ {
struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
intel_vbtn_pm_complete(dev); intel_vbtn_pm_complete(dev);
if (priv->has_switches)
detect_tablet_mode(dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment