diff options
| author | Eric Anholt <[email protected]> | 2016-07-08 01:53:53 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2016-07-08 01:53:53 +0000 |
| commit | 9f4e62f1520de97c302d65486b146b51c6ffde7c (patch) | |
| tree | 194fac093ff5a1a159b250cad654d8ff8d804cb5 /drivers/gpu/drm/vc4/vc4_kms.c | |
| parent | gpu: drm: vc4_hdmi: add missing of_node_put after calling of_parse_phandle (diff) | |
| parent | drm/vc4: Make pageflip completion handling more robust. (diff) | |
| download | kernel-9f4e62f1520de97c302d65486b146b51c6ffde7c.tar.gz kernel-9f4e62f1520de97c302d65486b146b51c6ffde7c.zip | |
Merge tag 'drm-vc4-fixes-2016-06-06' into drm-vc4-next
Merge Mario's get_vblank_counter fix forward to prevent conflicts with
his followon patch to add precise vblank timestamping.
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 cb37751bc99f..861a623bc185 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); |