Skip to content

Commit fe563a2

Browse files
committed
Merge tag 'acpi-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These update the ACPICA entry in MAINTAINERS, add a backlight handling quirk and fix the ACPI PRM (platform runtime) mechanism support. Specifics: - Update the ACPICA development list address in MAINTAINERS to the new one that does not bounce (Rafael Wysocki) - Check whether EFI runtime is available when registering the ACPI PRM address space handler and when running it (Ard Biesheuvel) - Add backlight=native DMI quirk for Acer Aspire 4810T to the ACPI video driver (Hans de Goede)" * tag 'acpi-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: PRM: Check whether EFI runtime is available ACPI: video: Add backlight=native DMI quirk for Acer Aspire 4810T MAINTAINERS: Update the ACPICA development list address
2 parents 1670d7e + 3bdd346 commit fe563a2

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ ACPI COMPONENT ARCHITECTURE (ACPICA)
383383
M: Robert Moore <[email protected]>
384384
M: "Rafael J. Wysocki" <[email protected]>
385385
386-
L: devel@acpica.org
386+
L: acpica-devel@lists.linuxfoundation.org
387387
S: Supported
388388
W: https://acpica.org/
389389
W: https://github.com/acpica/acpica/

drivers/acpi/prmt.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@ static acpi_status acpi_platformrt_space_handler(u32 function,
236236
efi_status_t status;
237237
struct prm_context_buffer context;
238238

239+
if (!efi_enabled(EFI_RUNTIME_SERVICES)) {
240+
pr_err_ratelimited("PRM: EFI runtime services no longer available\n");
241+
return AE_NO_HANDLER;
242+
}
243+
239244
/*
240245
* The returned acpi_status will always be AE_OK. Error values will be
241246
* saved in the first byte of the PRM message buffer to be used by ASL.
@@ -325,6 +330,11 @@ void __init init_prmt(void)
325330

326331
pr_info("PRM: found %u modules\n", mc);
327332

333+
if (!efi_enabled(EFI_RUNTIME_SERVICES)) {
334+
pr_err("PRM: EFI runtime services unavailable\n");
335+
return;
336+
}
337+
328338
status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
329339
ACPI_ADR_SPACE_PLATFORM_RT,
330340
&acpi_platformrt_space_handler,

drivers/acpi/video_detect.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
515515
DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),
516516
},
517517
},
518+
{
519+
.callback = video_detect_force_native,
520+
/* Acer Aspire 4810T */
521+
.matches = {
522+
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
523+
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 4810T"),
524+
},
525+
},
518526
{
519527
.callback = video_detect_force_native,
520528
/* Acer Aspire 5738z */

0 commit comments

Comments
 (0)