[Intel-gfx] [PATCH] drm/i915: Inject a failure point when registering a connector

[Jani Nikula]

On Wed, 10 Oct 2018, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> Check we can handle a late display load failure where the final act of
> registering the connector fails.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Ville Syrjala <ville.syrjala at linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Acked-by: Jani Nikula <jani.nikula at intel.com>

Though this'll need to be rebased as soon as I get CI results and merge
[1].

BR,
Jani.



[1] http://patchwork.freedesktop.org/patch/msgid/20181010075205.7713-2-jani.nikula@intel.com


> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fd27b9b0b4d8..c24314da741b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15867,8 +15867,15 @@ int intel_connector_register(struct drm_connector *connector)
>  	if (ret)
>  		goto err;
>  
> +	if (i915_inject_load_failure()) {
> +		ret = -EFAULT;
> +		goto err_backlight;
> +	}
> +
>  	return 0;
>  
> +err_backlight:
> +	intel_backlight_device_unregister(intel_connector);
>  err:
>  	return ret;
>  }

-- 
Jani Nikula, Intel Open Source Graphics Center