diff options
| author |   Dave Airlie <airlied@redhat.com> | 2016-03-17 08:11:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-17 08:11:31 +1000 |
| commit | 189df01d1cf27b88b3c41f9378453178f76925a8 (patch) | |
| tree | 0fca541c4ea3a1c871c301343526452d404a76ac | |
| parent | Merge tag 'drm/panel/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux into drm-next (diff) | |
| parent | drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect. (diff) | |
| download | linux-rng-189df01d1cf27b88b3c41f9378453178f76925a8.tar.xz linux-rng-189df01d1cf27b88b3c41f9378453178f76925a8.zip | |
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: 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; } |