Skip to content

Commit b1f195f

Browse files
ickleairlied
authored andcommitted
drm/i915/display: Go softly softly on initial modeset failure
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 <hjl.tools@gmail.com> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=210619 Fixes: b3bf99d ("drm/i915/display: Defer initial modeset until after GGTT is initialised") Fixes: ccc9e67 ("drm/i915/display: Defer initial modeset until after GGTT is initialised") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: H.J. Lu <hjl.tools@gmail.com> Cc: Dave Airlie <airlied@redhat.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201210230741.17140-1-chris@chris-wilson.co.uk
1 parent de2df16 commit b1f195f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18040,7 +18040,7 @@ int intel_modeset_init(struct drm_i915_private *i915)
1804018040
*/
1804118041
ret = intel_initial_commit(&i915->drm);
1804218042
if (ret)
18043-
return ret;
18043+
drm_dbg_kms(&i915->drm, "Initial modeset failed, %d\n", ret);
1804418044

1804518045
intel_overlay_setup(i915);
1804618046

0 commit comments

Comments
 (0)