diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /acpi-video-Add-force-native-backlight-quirk-for-Leno.patch | |
parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 'acpi-video-Add-force-native-backlight-quirk-for-Leno.patch')
-rw-r--r-- | acpi-video-Add-force-native-backlight-quirk-for-Leno.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch b/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch new file mode 100644 index 000000000..706fc540d --- /dev/null +++ b/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch @@ -0,0 +1,81 @@ +From: Hans de Goede <hdegoede@redhat.com> +Date: Tue, 3 Mar 2015 08:31:24 +0100 +Subject: [PATCH] acpi: video: Add force native backlight quirk for Lenovo + Ideapad Z570 + +The Lenovo Ideapad Z570 (which is an Acer in disguise like some other Ideapads) +has a broken acpi_video interface, this was fixed in commmit a11d342fb8 +("ACPI / video: force vendor backlight on Lenovo Ideapad Z570"). + +Which stops acpi_video from registering a backlight interface, but this is +only a partial fix, because for people who have the ideapad-laptop module +installed that module will now register a backlight interface, which also +does not work, so we need to use the native intel_backlight interface. + +The Lenovo Ideapad 570 is a pre-win8 laptop / too old for the acpi-video code +to automatically prefer the native backlight interface, so add a quirk for it. + +This commit also removes the previous incomplete fix. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1187004 +Cc: Stepan Bujnak <stepanbujnak@fastmail.fm> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + drivers/acpi/video.c | 17 +++++++++++++++++ + drivers/acpi/video_detect.c | 8 -------- + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c +index 70ea37bea84f..d9bf8ba7d848 100644 +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -425,6 +425,12 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d) + return 0; + } + ++static int __init video_enable_native_backlight(const struct dmi_system_id *d) ++{ ++ use_native_backlight_dmi = NATIVE_BACKLIGHT_ON; ++ return 0; ++} ++ + static struct dmi_system_id video_dmi_table[] __initdata = { + /* + * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121 +@@ -566,6 +572,17 @@ static struct dmi_system_id video_dmi_table[] __initdata = { + DMI_MATCH(DMI_PRODUCT_NAME, "XPS L521X"), + }, + }, ++ ++ /* Non win8 machines which need native backlight nevertheless */ ++ { ++ /* https://bugzilla.redhat.com/show_bug.cgi?id=1187004 */ ++ .callback = video_enable_native_backlight, ++ .ident = "Lenovo Ideapad Z570", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "102434U"), ++ }, ++ }, + {} + }; + +diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c +index 27c43499977a..c42feb2bacd0 100644 +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -174,14 +174,6 @@ static struct dmi_system_id video_detect_dmi_table[] = { + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5737"), + }, + }, +- { +- .callback = video_detect_force_vendor, +- .ident = "Lenovo IdeaPad Z570", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +- DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"), +- }, +- }, + { }, + }; + |