From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Mon, 29 Feb 2016 08:18:57 +0000 (+0100)
Subject: drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 79bf527e0a73..c803690293d7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10577,7 +10577,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;
 	}