On Thu, Dec 11, 2025 at 10:29 AM Mario Limonciello <[email protected]> wrote: > > From: "Mario Limonciello (AMD)" <[email protected]> > > 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) <[email protected]>
Reviewed-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 7333e19291cf..5de79e0df26a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -33,6 +33,7 @@ > #include <drm/drm_vblank.h> > > #include <linux/cc_platform.h> > +#include <linux/console.h> > #include <linux/dynamic_debug.h> > #include <linux/module.h> > #include <linux/mmu_notifier.h> > @@ -2685,7 +2686,9 @@ static int amdgpu_pmops_thaw(struct device *dev) > struct drm_device *drm_dev = dev_get_drvdata(dev); > > /* do not resume device if it's normal hibernation */ > - if (!pm_hibernate_is_recovering() && > !pm_hibernation_mode_is_suspend()) > + if (console_suspend_enabled && > + !pm_hibernate_is_recovering() && > + !pm_hibernation_mode_is_suspend()) > return 0; > > return amdgpu_device_resume(drm_dev, true); > -- > 2.51.2 >
