On Mon, Feb 29, 2016 at 09:18:57AM +0100, Maarten Lankhorst wrote: > CI runs with DEBUG_WW_MUTEX_SLOWPATH, so -EDEADLK occurs a lot more. Handle > the case > where drm_atomic_commit fails with -EDEADLK correctly. > > Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com> > --- > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 7c4ce3828d9d..09e4852bd752 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10557,7 +10557,8 @@ found: > goto fail; > } > > - if (drm_atomic_commit(state)) { > + ret = drm_atomic_commit(state); > + if (ret) { > DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); > goto fail; > } > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx