[Intel-gfx] [PATCH] drm/i915/display: Go softly softly on initial modeset failure

[Rodrigo Vivi]

On Thu, Dec 10, 2020 at 11:07:41PM +0000, Chris Wilson wrote:
> 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 at gmail.com>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=210619
> 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 <chris at chris-wilson.co.uk>
> Cc: "Ville Syrjälä" <ville.syrjala at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: H.J. Lu <hjl.tools at gmail.com>
> Cc: Dave Airlie <airlied at redhat.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index c567c0cada7e..761be8deaa9b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -18755,7 +18755,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);
>  
>  	intel_overlay_setup(i915);
>  
> -- 
> 2.20.1
>