Commit fe563a2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1670d7e6 3bdd346e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ ACPI COMPONENT ARCHITECTURE (ACPICA) 
M:	Robert Moore <robert.moore@intel.com>

M:	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

L:	linux-acpi@vger.kernel.org

L:	devel@acpica.org

L:	acpica-devel@lists.linuxfoundation.org

S:	Supported

W:	https://acpica.org/

W:	https://github.com/acpica/acpica/

drivers/acpi/prmt.c

+10 −0
Original line number Diff line number Diff line
@@ -236,6 +236,11 @@ static acpi_status acpi_platformrt_space_handler(u32 function, 
	efi_status_t status;

	struct prm_context_buffer context;



	if (!efi_enabled(EFI_RUNTIME_SERVICES)) {

		pr_err_ratelimited("PRM: EFI runtime services no longer available\n");

		return AE_NO_HANDLER;

	}



	/*

	 * The returned acpi_status will always be AE_OK. Error values will be

	 * saved in the first byte of the PRM message buffer to be used by ASL.
@@ -325,6 +330,11 @@ void __init init_prmt(void) 


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



	if (!efi_enabled(EFI_RUNTIME_SERVICES)) {

		pr_err("PRM: EFI runtime services unavailable\n");

		return;

	}



	status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,

						    ACPI_ADR_SPACE_PLATFORM_RT,

						    &acpi_platformrt_space_handler,

drivers/acpi/video_detect.c

+8 −0
Original line number Diff line number Diff line
@@ -515,6 +515,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Acer Aspire 4810T */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 4810T"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Acer Aspire 5738z */