Merge tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git/drm-intel into drm-next

airlied · airlied · commit 189df01d1cf2 · 2016-03-17T08:11:31.000+10:00
* tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git/drm-intel: drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
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`	`}`