Commit 189df01d authored Mar 17, 2016 by Dave Airlie

Merge tag 'drm-intel-next-fixes-2016-03-16' of...

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

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

parents 5e2368a3 94669e6b

drivers/gpu/drm/i915/intel_display.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}