drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.

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.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/56D3FEF1.6070306@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
(cherry picked from commit 3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8b7b8b64b0086935f5a94a43b7d90291a9beaaae..6e0d8283daa66d6383516c28542850d5c7364a48 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10542,7 +10542,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;
        }