Commit dde499d3 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Greg Kroah-Hartman

drm/fb_helper: Disable all crtc's when initial setup fails.

commit 52dd0650 upstream.

Some drivers like i915 start with crtc's enabled, but with deferred
fbcon setup they were no longer disabled as part of fbdev setup.
Headless units could no longer enter pc3 state because the crtc was
still enabled.

Fix this by calling restore_fbdev_mode when we would have called
it otherwise once during initial fbdev setup.
Signed-off-by: default avatarMaarten Lankhorst <>
Fixes: ca91a275 ("drm/fb-helper: Support deferred setup")
Reported-by: default avatarThomas Voegtle <>
Tested-by: default avatarThomas Voegtle <>
Reviewed-by: default avatarDaniel Vetter <>
Link: default avatarGreg Kroah-Hartman <>
parent e4c84b50
......@@ -1809,6 +1809,10 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
if (crtc_count == 0 || sizes.fb_width == -1 || sizes.fb_height == -1) {
DRM_INFO("Cannot find any crtc or sizes\n");
/* First time: disable all crtc's.. */
if (!fb_helper->deferred_setup && !READ_ONCE(fb_helper->dev->master))
return -EAGAIN;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment