tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9c59b464 45dcf5e2

+26 -11
+1 -1
MAINTAINERS
··· 19104 19104 M: Kai-Heng Feng <kaihengf@nvidia.com> 19105 19105 L: linux-acpi@vger.kernel.org 19106 19106 S: Maintained 19107 - F: drivers/acpi/apei/nvidia-ghes.c 19107 + F: drivers/acpi/apei/ghes-nvidia.c 19108 19108 19109 19109 NVIDIA VRS RTC DRIVER 19110 19110 M: Shubhi Garg <shgarg@nvidia.com>
+1 -1
drivers/acpi/power.c
··· 987 987 return device; 988 988 989 989 err: 990 - acpi_release_power_resource(&device->dev); 990 + acpi_dev_put(device); 991 991 return NULL; 992 992 } 993 993
+1 -1
drivers/acpi/scan.c
··· 1900 1900 result = acpi_device_add(device); 1901 1901 1902 1902 if (result) { 1903 - acpi_device_release(&device->dev); 1903 + acpi_dev_put(device); 1904 1904 return result; 1905 1905 } 1906 1906
+17 -8
drivers/acpi/video_detect.c
··· 878 878 DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 7760 AIO"), 879 879 }, 880 880 }, 881 + { 882 + .callback = video_detect_force_native, 883 + /* Dell OptiPlex 7770 AIO */ 884 + .matches = { 885 + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 886 + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 7770 AIO"), 887 + }, 888 + }, 881 889 882 890 /* 883 891 * Models which have nvidia-ec-wmi support, but should not use it. ··· 905 897 .matches = { 906 898 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 907 899 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 15 3535"), 900 + }, 901 + }, 902 + { 903 + /* https://gitlab.freedesktop.org/drm/amd/-/issues/4512 */ 904 + .callback = video_detect_force_native, 905 + /* Lenovo Legion S7 15ACH6 */ 906 + .matches = { 907 + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 908 + DMI_MATCH(DMI_PRODUCT_NAME, "82K8"), 908 909 }, 909 910 }, 910 911 ··· 963 946 .matches = { 964 947 DMI_MATCH(DMI_SYS_VENDOR, "Xiaomi Inc"), 965 948 DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"), 966 - }, 967 - }, 968 - /* https://gitlab.freedesktop.org/drm/amd/-/issues/4512 */ 969 - { 970 - .callback = video_detect_force_native, 971 - .matches = { 972 - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 973 - DMI_MATCH(DMI_PRODUCT_NAME, "82K8"), 974 949 }, 975 950 }, 976 951 { },
+6
include/linux/acpi.h
··· 959 959 return -ENODEV; 960 960 } 961 961 962 + static inline int acpi_get_cpu_uid(unsigned int cpu, u32 *uid) 963 + { 964 + *uid = cpu; 965 + return 0; 966 + } 967 + 962 968 static inline int acpi_nvs_register(__u64 start, __u64 size) 963 969 { 964 970 return 0;