| Message ID | 20191217190811.638607-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards | expand |
Hi, On 26-12-2019 00:55, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.4.5, v5.3.18, v4.19.90, v4.14.159, v4.9.206, v4.4.206. > > v5.4.5: Build OK! > v5.3.18: Build OK! > v4.19.90: Build OK! > v4.14.159: Build OK! > v4.9.206: Failed to apply! Possible dependencies: > 1f59ab2783ae ("ACPI / video: Add force_none quirk for Dell OptiPlex 9020M") > d37efb79bc1c ("ACPI / video: Add quirks for the Dell Precision 7510") > > v4.4.206: Failed to apply! Possible dependencies: > 1f59ab2783ae ("ACPI / video: Add force_none quirk for Dell OptiPlex 9020M") > d37efb79bc1c ("ACPI / video: Add quirks for the Dell Precision 7510") > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? This fix is mostly cosmetical (it hides a non working brightness control in various desktop environments) so just backporting this to the kernels where it cleanly applies is fine. Regards, Hans
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 31014c7d3793..e63fd7bfd3a5 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -336,6 +336,11 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), }, }, + + /* + * Desktops which falsely report a backlight and which our heuristics + * for this do not catch. + */ { .callback = video_detect_force_none, .ident = "Dell OptiPlex 9020M", @@ -344,6 +349,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"), }, }, + { + .callback = video_detect_force_none, + .ident = "MSI MS-7721", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MSI"), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-7721"), + }, + }, { }, };
Despite our heuristics to not wrongly export a non working ACPI backlight interface on desktop machines, we still end up exporting one on desktops using a motherboard from the MSI MS-7721 series. I've looked at improving the heuristics, but in this case a quirk seems to be the only way to solve this. While at it also add a comment to separate the video_detect_force_none entries in the video_detect_dmi_table from other type of entries, as we already do for the other entry types. Cc: stable@vger.kernel.org BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1783786 Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/acpi/video_detect.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)