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.
This commit is contained in:
Dave Airlie 2016-03-17 08:11:31 +10:00
commit 189df01d1c

View File

@ -10542,7 +10542,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
goto fail; 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"); DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
goto fail; goto fail;
} }