diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-02-29 09:18:57 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-03-14 10:50:58 +0200 |
| commit | 94669e6ba1ada133394ec8295d773df8b9238d08 (patch) | |
| tree | 1ce38feea6dbd415ff5513ccd247f3bd6a18e2d8 | |
| parent | f2c488212b511f7eadef78c564f1bff8f64db231 (diff) | |
drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.drm-intel-next-fixes-2016-03-16
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 3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8b7b8b64b008..6e0d8283daa6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10542,7 +10542,8 @@ found: 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; } |