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.

drm/amd: Resume the device in thaw() callback when console suspend is disabled

If console suspend has been disabled using `no_console_suspend` also
wake up during thaw() so that some messages can be seen for debugging.

Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/4191
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Mario Limonciello (AMD) and committed by
Alex Deucher 63387cbb e83f63da

+4 -1
+4 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
··· 33 33 #include <drm/drm_vblank.h> 34 34 35 35 #include <linux/cc_platform.h> 36 + #include <linux/console.h> 36 37 #include <linux/dynamic_debug.h> 37 38 #include <linux/module.h> 38 39 #include <linux/mmu_notifier.h> ··· 2705 2704 struct drm_device *drm_dev = dev_get_drvdata(dev); 2706 2705 2707 2706 /* do not resume device if it's normal hibernation */ 2708 - if (!pm_hibernate_is_recovering() && !pm_hibernation_mode_is_suspend()) 2707 + if (console_suspend_enabled && 2708 + !pm_hibernate_is_recovering() && 2709 + !pm_hibernation_mode_is_suspend()) 2709 2710 return 0; 2710 2711 2711 2712 return amdgpu_device_resume(drm_dev, true);