Commit 94669e6b authored Feb 29, 2016 by Maarten Lankhorst Committed by Jani Nikula Mar 14, 2016

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>
(cherry picked from commit 3ba86073)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent f2c48821

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