Commit 9c59b464 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-7.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI support fixes from Rafael Wysocki:
 "These fix two potential refcount leaks in error code paths in the ACPI
  core code, address a recently introduced build breakage related to the
  CPU UID handling consolidation, fix up a recently added MAINTAINERS
  entry, fix the quirk list in the ACPI video bus driver, and add a new
  quirk to it:

   - Add an acpi_get_cpu_uid() stub helper to address an x86 Xen support
     build breakage (Arnd Bergmann)

   - Use acpi_dev_put() in object add error paths in the ACPI core to
     avoid refcount leaks (Guangshuo Li)

   - Adjust the file entry in the recently added NVIDIA GHES HANDLER
     entry in MAINTAINERS to the actual existing file (Lukas Bulwahn)

   - Add backlight=native quirk for Dell OptiPlex 7770 AIO to the ACPI
     video bus driver (Jan Schär)

   - Move Lenovo Legion S7 15ACH6 quirk to the right section of the
     quirk list in the ACPI video bus driver (Hans de Goede)"

* tag 'acpi-7.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: video: Move Lenovo Legion S7 15ACH6 quirk to the right section
  ACPI: video: Add backlight=native quirk for Dell OptiPlex 7770 AIO
  ACPI: add acpi_get_cpu_uid() stub helper
  MAINTAINERS: adjust file entry in NVIDIA GHES HANDLER
  ACPI: scan: Use acpi_dev_put() in object add error paths
parents 45dcf5e2 beca8264

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -19104,7 +19104,7 @@ NVIDIA GHES VENDOR CPER RECORD HANDLER 
M:	Kai-Heng Feng <kaihengf@nvidia.com>

L:	linux-acpi@vger.kernel.org

S:	Maintained

F:	drivers/acpi/apei/nvidia-ghes.c

F:	drivers/acpi/apei/ghes-nvidia.c









NVIDIA VRS RTC DRIVER









M:	Shubhi Garg <shgarg@nvidia.com>

























drivers/acpi/power.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -987,7 +987,7 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)







	return device;



















 err:









	acpi_release_power_resource(&device->dev);









	acpi_dev_put(device);









	return NULL;









}










































drivers/acpi/scan.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1900,7 +1900,7 @@ static int acpi_add_single_object(struct acpi_device **child,







		result = acpi_device_add(device);



















	if (result) {









		acpi_device_release(&device->dev);









		acpi_dev_put(device);









		return result;









	}










































drivers/acpi/video_detect.c



+17
−8






























Original line number
Diff line number
Diff line







@@ -878,6 +878,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {







		DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 7760 AIO"),









		},









	},









	{









	 .callback = video_detect_force_native,









	 /* Dell OptiPlex 7770 AIO */









	 .matches = {









		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),









		DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 7770 AIO"),









		},









	},



















	/*









	 * Models which have nvidia-ec-wmi support, but should not use it.








@@ -899,6 +907,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {







		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 15 3535"),









		},









	},









	{









	 /* https://gitlab.freedesktop.org/drm/amd/-/issues/4512 */









	 .callback = video_detect_force_native,









	 /* Lenovo Legion S7 15ACH6 */









	 .matches = {









		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),









		DMI_MATCH(DMI_PRODUCT_NAME, "82K8"),









		},









	},



















	/*









	 * x86 android tablets which directly control the backlight through








@@ -948,14 +965,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = {







		DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"),









		},









	},









	/* https://gitlab.freedesktop.org/drm/amd/-/issues/4512 */









	{









	 .callback = video_detect_force_native,









	 .matches = {









		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),









		DMI_MATCH(DMI_PRODUCT_NAME, "82K8"),









		},









	},









	{ },









};










































include/linux/acpi.h



+6
−0






























Original line number
Diff line number
Diff line







@@ -959,6 +959,12 @@ static inline int acpi_table_parse(char *id,







	return -ENODEV;









}



















static inline int acpi_get_cpu_uid(unsigned int cpu, u32 *uid)









{









	*uid = cpu;









	return 0;









}



















static inline int acpi_nvs_register(__u64 start, __u64 size)









{









	return 0;