Experiment with how fault tolerant we are if the initial modeset fails
and we need to abort the driver load.

Suggested-by: Tvrtko Ursulin <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Cc: Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index c567c0cada7e..875a7c1ddf08 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -18495,8 +18495,12 @@ static int intel_initial_commit(struct drm_device *dev)
                }
        }
 
-       ret = drm_atomic_commit(state);
+       if (i915_inject_probe_failure(to_i915(dev))) {
+               ret = -ENODEV;
+               goto out;
+       }
 
+       ret = drm_atomic_commit(state);
 out:
        if (ret == -EDEADLK) {
                drm_atomic_state_clear(state);
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to