Skip to content

nvidia-drm: Fix display not waking after suspend/resume #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
destenson wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −0
Open

nvidia-drm: Fix display not waking after suspend/resume #996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions kernel-open/nvidia-drm/nvidia-drm-drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,6 +2172,11 @@ void nv_drm_suspend_resume(NvBool suspend)

/*
* NVKMS shuts down all heads on suspend. Update DRM state accordingly.
*
* BUGFIX: Previously, drm_mode_config_reset() was called on suspend
* but nothing restored the display modes on resume, causing black screen
* after suspend/resume. Now we properly restore the mode config on resume.
* See: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/450
*/
for (nv_dev = dev_list; nv_dev; nv_dev = nv_dev->next) {
struct drm_device *dev = nv_dev->dev;
Expand All @@ -2191,6 +2196,8 @@ void nv_drm_suspend_resume(NvBool suspend)
drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 0);
#endif
drm_kms_helper_poll_enable(dev);
/* Restore mode config to re-enable display output after resume */
drm_mode_config_reset(dev);
}
}

Expand Down