Skip to content

Commit 46713ae

Browse files
pyma1andy-shev
authored andcommitted
platform/x86: thinkpad_acpi: not loading brightness_init when _BCL invalid
When _BCL invalid, disable thinkpad_acpi backlight brightness control. brightness_enable is already checked at the beginning. Most new thinkpads are using GPU driver to control brightness now, print notice when enabled brightness control even when brightness_enable = 1. Signed-off-by: Aaron Ma <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent acf7f4a commit 46713ae

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6963,10 +6963,13 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
69636963
pr_warn("Cannot enable backlight brightness support, ACPI is already handling it. Refer to the acpi_backlight kernel parameter.\n");
69646964
return 1;
69656965
}
6966-
} else if (tp_features.bright_acpimode && brightness_enable > 1) {
6967-
pr_notice("Standard ACPI backlight interface not available, thinkpad_acpi native brightness control enabled\n");
6966+
} else if (!tp_features.bright_acpimode) {
6967+
pr_notice("ACPI backlight interface not available\n");
6968+
return 1;
69686969
}
69696970

6971+
pr_notice("ACPI native brightness control enabled\n");
6972+
69706973
/*
69716974
* Check for module parameter bogosity, note that we
69726975
* init brightness_mode to TPACPI_BRGHT_MODE_MAX in order to be

0 commit comments

Comments
 (0)