On Fri, 04 Dec 2020, Chris Wilson <[email protected]> wrote:
> 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 | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 6e5b93f6a25e..86124b8d156d 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);
If this is just for CI testing, fine. But for actual merging, please
don't hide the happy day scenario in the probe failure if branch.
BR,
Jani.
>
> out:
> if (ret == -EDEADLK) {
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
