mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
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 3ba86073ed
)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
f2c488212b
commit
94669e6ba1
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue