diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
| commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
| tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /drivers/gpu/drm/vc4/vc4_kms.c | |
| parent | 5130213721d01b6632c255d4295a8102cbb58379 (diff) | |
| parent | f00c0afdfa625165a609513bc74164d56752ec3e (diff) | |
| download | linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz | |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_kms.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_kms.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index cb37751..861a623 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -117,10 +117,18 @@ static int vc4_atomic_commit(struct drm_device *dev, return -ENOMEM; /* Make sure that any outstanding modesets have finished. */ - ret = down_interruptible(&vc4->async_modeset); - if (ret) { - kfree(c); - return ret; + if (nonblock) { + ret = down_trylock(&vc4->async_modeset); + if (ret) { + kfree(c); + return -EBUSY; + } + } else { + ret = down_interruptible(&vc4->async_modeset); + if (ret) { + kfree(c); + return ret; + } } ret = drm_atomic_helper_prepare_planes(dev, state); |