Support intel-vbtn based tablet mode switch
PATCH 1/1 Support intel-vbtn based tablet mode switch
some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in intel acpi,
the events to enter and exit the tablet mode are 0xCC and 0xCD
--- drivers/platform/x86/intel-vbtn.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/platform/x86/intel-vbtn.c +28 -0
@@ -26,6 +26,9 @@#include <linux/suspend.h> #include <acpi/acpi_bus.h> +/* When NOT in tablet mode, VBDS has the flag 0x40 */ +#define TABLET_MODE_FLAG 0x40 +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AceLan Kao" );
@@ -42,6 +45,8 @@ static const struct key_entry intel_vbtn_keymap[] = { { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */ { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */ { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* volume-down key release */ + { KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tabletmode in */ + { KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tabletmode out */ { KE_END }, };
@@ -81,6 +86,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)return ; } }else if (sparse_keymap_report_event (priv->input_dev, event,1 , true)) { +input_sync (priv->input_dev);return ; }dev_info (&device->dev,"unknown event index 0x%x\n" , event);
@@ -92,6 +98,7 @@ static int intel_vbtn_probe(struct platform_device *device)struct intel_vbtn_priv *priv;acpi_status status;int err; +struct acpi_buffer vgbs_output = {ACPI_ALLOCATE_BUFFER ,NULL }; status =acpi_evaluate_object (handle,"VBDL" ,NULL ,NULL );if (ACPI_FAILURE (status)) {
@@ -110,6 +117,27 @@ static int intel_vbtn_probe(struct platform_device *device)return err; } + status =acpi_evaluate_object (handle,"VGBS" ,NULL , &vgbs_output); +/* VGBS being present and returning something means +* we have a tablet mode switch +*/ +if (ACPI_SUCCESS (status)) { +union acpi_object *obj = vgbs_output.pointer; + +input_set_capability (priv->input_dev,EV_SW ,SW_TABLET_MODE ); + +if (obj && obj->type ==ACPI_TYPE_INTEGER ) { +if (obj->integer.value &TABLET_MODE_FLAG ) +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +0 ); +else +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +1 ); + } + } + status = acpi_install_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler,
Signature · 1 line
2.7.4
Quoted 3 lines · Marco Martin
some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in intel acpi,
the events to enter and exit the tablet mode are0xCCand0xCD
Thanks for an update.
For the future, please consider the following:
- use -v<N> to git format-patch to get a proper version of the patch (-v2 in this case)
- use proper English grammar, i.e. capitalize sentences in the commit message, put periods and so on
- CC: tag will look better if capitalized as a word, i.e. Cc:
Quoted 7 lines
CC Matthew Garrett <[email protected]>CC "Pali Rohár" <[email protected]>CC Darren Hart <[email protected]>CC Mario Limonciello <[email protected]>CC Andy Shevchenko <[email protected]>
Before I will go somewhere with this version, I would like to hear from Dmitry that the approach is correct per se.
Also, some style comments below.
drivers/platform/x86/intel-vbtn.c static const struct key_entry intel_vbtn_keymap[] = { · line 49
Quoted 2 lines
drivers/platform/x86/intel-vbtn.c +2
-0+ { KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tabletmode in */ + { KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tabletmode out */
Tabletmode -> Tablet mode
Quoted 4 lines
struct intel_vbtn_priv *priv; acpi_status status; int err;+ struct
acpi_buffervgbs_output= {ACPI_ALLOCATE_BUFFER, NULL };
Please, locate this in a rule:
long lines first, group of assignments even before them if it's
allowed by an execution path.
Quoted 5 lines
drivers/platform/x86/intel-vbtn.c +5
-0+ status =acpi_evaluate_object (handle,"VGBS" ,NULL , &vgbs_output); +/* VGBS being present and returning something means +* we have a tablet mode switch +*/ +if (ACPI_SUCCESS (status)) {
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 133
Quoted 10 lines
drivers/platform/x86/intel-vbtn.c +9
-0+union acpi_object *obj = vgbs_output.pointer; + +input_set_capability (priv->input_dev,EV_SW ,SW_TABLET_MODE ); + +if (obj && obj->type ==ACPI_TYPE_INTEGER ) { +if (obj->integer.value &TABLET_MODE_FLAG ) +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +0 );
One line?
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 137
Quoted 5 lines
drivers/platform/x86/intel-vbtn.c +4
-0+else +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +1 );
Ditto.
Besides that, if you have more then one line in the branches, use curly braces — if {} else {}.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines
drivers/platform/x86/intel-vbtn.c +12
-0+ status =acpi_evaluate_object (handle,"VGBS" ,NULL , &vgbs_output); +/* VGBS being present and returning something means +* we have a tablet mode switch +*/ +if (ACPI_SUCCESS (status)) { +union acpi_object *obj = vgbs_output.pointer; + +input_set_capability (priv->input_dev,EV_SW ,SW_TABLET_MODE ); + +if (obj && obj->type ==ACPI_TYPE_INTEGER ) { +if (obj->integer.value &TABLET_MODE_FLAG ) + input_report_switch(priv->input_dev,
Quoted 4 lines
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 133
Quoted 2 lines
drivers/platform/x86/intel-vbtn.c +2
-0+SW_TABLET_MODE , + 0);One line?
checkpatch.pl was complaining about lines too long.
--
Marco Martin
Quoted 7 lines · Marco Martin
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines
drivers/platform/x86/intel-vbtn.c +3
-0+if (obj && obj->type ==ACPI_TYPE_INTEGER ) { +if (obj->integer.value &TABLET_MODE_FLAG ) + input_report_switch(priv->input_dev,
Quoted 6 lines
Quoted 4 lines
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 133
Quoted 2 lines
drivers/platform/x86/intel-vbtn.c +2
-0+SW_TABLET_MODE , + 0);One line?
checkpatch.pl was complaining about lines too long.
My mailer is using true type fonts, so, I don't see clearly an indentation here, if you already moved SW_ under priv-> that's fine to leave, otherwise, just move one tab left the entire line.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 40 lines · Marco Martin
some laptops such as Dell Inspiron 7000 series have the tablet mode switch implemented in intel acpi,
the events to enter and exit the tablet mode are0xCCand0xCDCC Matthew Garrett <[email protected]>CC "Pali Rohár" <[email protected]>CC Darren Hart <[email protected]>CC Mario Limonciello <[email protected]>CC Andy Shevchenko <[email protected]>Signed-off-by Marco Martin <[email protected]>--- drivers/platform/x86/intel-vbtn.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)drivers/platform/x86/intel-vbtn.c +5
-0@@ -26,6 +26,9 @@#include <linux/suspend.h> #include <acpi/acpi_bus.h> +/* When NOT in tablet mode, VBDS has the flag 0x40 */ +#define TABLET_MODE_FLAG 0x40 +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AceLan Kao" );@@ -42,6 +45,8 @@ static const struct key_entry intel_vbtn_keymap[] = { { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */ { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */ { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* volume-down key release */ + { KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tabletmode in */ + { KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Tabletmode out */ { KE_END }, };
drivers/platform/x86/intel-vbtn.c static void notify_handler(acpi_handle handle, u32 event, void *context) · line 89
Quoted 4 lines
drivers/platform/x86/intel-vbtn.c +1
-0@@ -81,6 +86,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)return ; } }else if (sparse_keymap_report_event (priv->input_dev, event,1 , true)) { +input_sync (priv->input_dev);
I do not understand why this is needed, as sparse keymap should issue sync for you. From sparse_keymap_report_entry():
case KE_SW: value = ke->sw.value; /* fall through */ case KE_VSW: input_report_switch(dev, ke->sw.code, value); input_sync(dev); ^^^^^^^^^- here is the sync. break; } }
Quoted 15 lines
drivers/platform/x86/intel-vbtn.c +1
-0return ; }dev_info (&device->dev,"unknown event index 0x%x\n" , event);@@ -92,6 +98,7 @@ static int intel_vbtn_probe(struct platform_device *device)struct intel_vbtn_priv *priv;acpi_status status;int err; +struct acpi_buffer vgbs_output = {ACPI_ALLOCATE_BUFFER ,NULL }; status =acpi_evaluate_object (handle,"VBDL" ,NULL ,NULL );if (ACPI_FAILURE (status)) {@@ -110,6 +117,27 @@ static int intel_vbtn_probe(struct platform_device *device)return err; }
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 129
Quoted 10 lines
drivers/platform/x86/intel-vbtn.c +10
-0+ status =acpi_evaluate_object (handle,"VGBS" ,NULL , &vgbs_output); +/* VGBS being present and returning something means +* we have a tablet mode switch +*/ +if (ACPI_SUCCESS (status)) { +union acpi_object *obj = vgbs_output.pointer; + +input_set_capability (priv->input_dev,EV_SW ,SW_TABLET_MODE ); + +if (obj && obj->type ==ACPI_TYPE_INTEGER ) {
Do you want to set the capability if you do not get 'obj' or it is of different type?
drivers/platform/x86/intel-vbtn.c static int intel_vbtn_probe(struct platform_device *device) · line 137
Quoted 8 lines
drivers/platform/x86/intel-vbtn.c +8
-0+if (obj->integer.value &TABLET_MODE_FLAG ) +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +0 ); +else +input_report_switch (priv->input_dev, +SW_TABLET_MODE , +1 );
Can be shorter:
input_report_switch(priv->input_dev, SW_TABLET_MODE, obj->integer.value & TABLET_MODE_FLAG);
You also need:
input_sync(priv->input_dev);
Thanks.
Signature · 1 line
Dmitry
Quoted 8 lines · Dmitry Torokhov
drivers/platform/x86/intel-vbtn.c static void notify_handler(acpi_handle handle, u32 event, void *context) · line 89
Quoted 5 lines
drivers/platform/x86/intel-vbtn.c +1
-0@@ -81,6 +86,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)return ; } }else if (sparse_keymap_report_event (priv->input_dev, event,1 , true)) { +input_sync (priv->input_dev);I do not understand why this is needed, as sparse keymap should issue sync for you. From
sparse_keymap_report_entry():
indeed, I was testing on a 4.13 build, the sync there was pushed in november only for 4.14, i've rebuilt it now on 4.14 and my sync is not needed anymore
Quoted 8 lines
Can be shorter:
input_report_switch(priv->input_dev, SW_TABLET_MODE, obj->integer.value & TABLET_MODE_FLAG);You also need:
input_sync(priv->input_dev);
in v3 this shorter version and doesn't report the capability if it's the wrong type
--
Marco Martin