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

mlankhorst · mlankhorst · commit 3ba86073edcb · 2016-03-01T09:40:51.000+01:00
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
@@ -10577,7 +10577,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
 		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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -10577,7 +10577,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,`
`10577`	`10577`	`goto fail;`
`10578`	`10578`	`}`
`10579`	`10579`
`10580`		`- if (drm_atomic_commit(state)) {`
	`10580`	`+ ret = drm_atomic_commit(state);`
	`10581`	`+ if (ret) {`
`10581`	`10582`	`DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");`
`10582`	`10583`	`goto fail;`
`10583`	`10584`	`}`