Skip to content

Commit

Permalink
drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maarten Lankhorst committed Mar 1, 2016
1 parent d9f8e52 commit 3ba8607
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -10577,7 +10577,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;
}
Expand Down

0 comments on commit 3ba8607

Please sign in to comment.