Commit 358d6a2c authored by Hans de Goede's avatar Hans de Goede Committed by Darren Hart

toshiba_acpi: Do not register vendor backlight when acpi_video bl is available

commit a39f46df ("toshiba_acpi: Fix regression caused by backlight extra
check code") causes the backlight to no longer work on the Toshiba Z30,
reverting that commit fixes this but restores the original issue fixed
by that commit.

Looking at the toshiba_acpi backlight code for a fix for this I noticed that
the toshiba code is the only code under platform/x86 which unconditionally
registers a vendor acpi backlight interface, without checking for acpi_video
backlight support first.

This commit adds the necessary checks bringing toshiba_acpi in line with the
other drivers, and fixing the Z30 regression without needing to revert the
commit causing it.

Chances are that there will be some Toshiba models which have a non working
acpi-video implementation while the toshiba vendor backlight interface does
work, this commit adds an empty dmi_id table where such systems can be added,
this is identical to how other drivers handle such systems.

BugLink: default avatarHans de Goede <>
Reviewed-and-tested-by: default avatarAzael Avalos <>
Signed-off-by: default avatarDarren Hart <>
parent cdbff611
......@@ -614,6 +614,7 @@ config ACPI_TOSHIBA
depends on INPUT
depends on RFKILL || RFKILL = n
depends on SERIO_I8042 || SERIO_I8042 = n
depends on ACPI_VIDEO || ACPI_VIDEO = n
......@@ -49,7 +49,9 @@
#include <linux/workqueue.h>
#include <linux/i8042.h>
#include <linux/acpi.h>
#include <linux/dmi.h>
#include <linux/uaccess.h>
#include <acpi/video.h>
MODULE_AUTHOR("John Belmonte");
MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver");
......@@ -263,6 +265,14 @@ static const struct key_entry toshiba_acpi_alt_keymap[] = {
{ KE_END, 0 },
* List of models which have a broken acpi-video backlight interface and thus
* need to use the toshiba (vendor) interface instead.
static const struct dmi_system_id toshiba_vendor_backlight_dmi[] = {
* Utility
......@@ -2624,6 +2634,20 @@ static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
ret = get_tr_backlight_status(dev, &enabled);
dev->tr_backlight_supported = !ret;
* Tell acpi-video-detect code to prefer vendor backlight on all
* systems with transflective backlight and on dmi matched systems.
if (dev->tr_backlight_supported ||
if (acpi_video_backlight_support())
return 0;
/* acpi-video may have loaded before we called dmi_promote_vendor() */
memset(&props, 0, sizeof(props));
props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
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