diff options
| author | Maarten Lankhorst | 2016-02-29 09:18:57 +0100 |
|---|---|---|
| committer | Maarten Lankhorst | 2016-03-01 09:40:51 +0100 |
| commit | 3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a (patch) | |
| tree | efcf5b810cc65beec1f23b6d0b55cbec84ddddd2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: remove dead code (diff) | |
| download | kernel-qcow2-linux-3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a.tar.gz kernel-qcow2-linux-3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a.tar.xz kernel-qcow2-linux-3ba86073edcbe2be53d9862d5a3098f0ebf8ae9a.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -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 79bf527e0a73..c803690293d7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10577,7 +10577,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; } |