diff options
authorChris Wilson <>2020-12-10 23:07:41 +0000
committerDave Airlie <>2020-12-11 09:54:30 +1000
commitb1f195fc49812359296a901e26cc7c0b761d8a70 (patch)
parentde2df164e3f905ddcf978358cb6e69958b5d3bcc (diff)
drm/i915/display: Go softly softly on initial modeset failuredrm-fixes-2020-12-11
Reduce the module/device probe error into a mere debug to hide issues where the initial modeset is failing (after lies told by hw probe) and the system hangs with a livelock in cleaning up the failed commit. Reported-by: H.J. Lu <> Bugzilla: Fixes: b3bf99daaee9 ("drm/i915/display: Defer initial modeset until after GGTT is initialised") Fixes: ccc9e67ab26f ("drm/i915/display: Defer initial modeset until after GGTT is initialised") Signed-off-by: Chris Wilson <> Cc: "Ville Syrjälä" <> Cc: Rodrigo Vivi <> Cc: H.J. Lu <> Cc: Dave Airlie <> Reviewed-by: Rodrigo Vivi <> Signed-off-by: Dave Airlie <> Link:
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 3bfe6ed67da1..aabf09f89cad 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -18040,7 +18040,7 @@ int intel_modeset_init(struct drm_i915_private *i915)
ret = intel_initial_commit(&i915->drm);
if (ret)
- return ret;
+ drm_dbg_kms(&i915->drm, "Initial modeset failed, %d\n", ret);