summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_connector.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-10-10 13:38:33 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2018-10-10 14:34:08 +0100
commit41c43f9e02765b5dd8646bef803eb57c95e56551 (patch)
treea0ddbc60918f4e0b04ca5b5ee7eaff79cca4da2e /drivers/gpu/drm/i915/intel_connector.c
parent1c21348d1f3c5babd4f5727038b8c5bd38253f3b (diff)
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 <chris@chris-wilson.co.uk> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Jani Nikula <jani.nikula@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181010123833.16797-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_connector.c')
-rw-r--r--drivers/gpu/drm/i915/intel_connector.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
index d56f50a6f5a0..598d5cb9b657 100644
--- 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;
}