drm/i915: Inject a failure point when registering a connector

Check we can handle a late display load failure where the final act of
registering the connector fails.

Signed-off-by: Chris Wilson <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Ville Syrjala <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Reviewed-by: Maarten Lankhorst <[email protected]>
Acked-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
index d56f50a6f5a0809ab93ce1c1fbbf1ac9e84bcc7b..598d5cb9b657e1b68f67ec549aae0b50b99c71ea 100644 (file)
--- a/drivers/gpu/drm/i915/intel_connector.c
+++ b/drivers/gpu/drm/i915/intel_connector.c
@@ -107,8 +107,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;
 }