Skip to content

Commit c936954

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI: video: Use acpi_device_fix_up_power_children()
Commit 89c290e ("ACPI: video: Put ACPI video and its child devices into D0 on boot") introduced calling acpi_device_fix_up_power_extended() on the video card for which the ACPI video bus is the companion device. This unnecessarily touches the power-state of the GPU itself, while the issue it tries to address only requires calling _PS0 on the child devices. Touching the power-state of the GPU itself is causing suspend / resume issues on e.g. a Lenovo ThinkPad W530. Instead use acpi_device_fix_up_power_children(), which only touches the child devices, to fix this. Fixes: 89c290e ("ACPI: video: Put ACPI video and its child devices into D0 on boot") Reported-by: Owen T. Heisler <writer@owenh.net> Closes: https://lore.kernel.org/regressions/9f36fb06-64c4-4264-aaeb-4e1289e764c4@owenh.net/ Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/273 Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218124 Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Tested-by: Owen T. Heisler <writer@owenh.net> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Cc: 6.6+ <stable@vger.kernel.org> # 6.6+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 37ba91a commit c936954

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/acpi/acpi_video.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2031,7 +2031,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
20312031
* HP ZBook Fury 16 G10 requires ACPI video's child devices have _PS0
20322032
* evaluated to have functional panel brightness control.
20332033
*/
2034-
acpi_device_fix_up_power_extended(device);
2034+
acpi_device_fix_up_power_children(device);
20352035

20362036
pr_info("%s [%s] (multi-head: %s rom: %s post: %s)\n",
20372037
ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

0 commit comments

Comments
 (0)