diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-16 18:11:31 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-16 18:11:31 -0400 |
| commit | 189df01d1cf27b88b3c41f9378453178f76925a8 (patch) | |
| tree | 0fca541c4ea3a1c871c301343526452d404a76ac | |
| parent | 5e2368a3bbb36d24c038d87d61ebf291e4be5197 (diff) | |
| parent | 94669e6ba1ada133394ec8295d773df8b9238d08 (diff) | |
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.
| -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: | |||
| 10542 | goto fail; | 10542 | goto fail; |
| 10543 | } | 10543 | } |
| 10544 | 10544 | ||
| 10545 | if (drm_atomic_commit(state)) { | 10545 | ret = drm_atomic_commit(state); |
| 10546 | if (ret) { | ||
| 10546 | DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); | 10547 | DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); |
| 10547 | goto fail; | 10548 | goto fail; |
| 10548 | } | 10549 | } |