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

mlankhorst · jnikula · commit 94669e6ba1ad · 2016-03-14T10:50:58.000+02: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> (cherry picked from commit 3ba8607) 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
@@ -10542,7 +10542,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
`@@ -10542,7 +10542,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,`
`10542`	`10542`	`goto fail;`
`10543`	`10543`	`}`
`10544`	`10544`
`10545`		`- if (drm_atomic_commit(state)) {`
	`10545`	`+ ret = drm_atomic_commit(state);`
	`10546`	`+ if (ret) {`
`10546`	`10547`	`DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");`
`10547`	`10548`	`goto fail;`
`10548`	`10549`	`}`