| Message ID | 20201204171455.6276-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: Inject a failure into the initial modeset | expand |
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 6e5b93f6a25e..c76c34e2c77a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -18456,7 +18456,9 @@ static int intel_initial_commit(struct drm_device *dev) } } - ret = drm_atomic_commit(state); + ret = -ENODEV; + if (i915_inject_probe_failure(to_i915(dev))) + ret = drm_atomic_commit(state); out: if (ret == -EDEADLK) {
Experiment with how fault tolerant we are if the initial modeset fails and we need to abort the driver load. Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)