Commit 3cfac69c authored by Philipp Zabel's avatar Philipp Zabel Committed by Rob Clark

drm/msm: for array in-fences, check if all backing fences are from our own context before waiting

Use the dma_fence_match_context helper to check if all backing fences
are from our own context, in which case we don't have to wait.
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
[rebased on code-motion]
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent c43dd227
...@@ -410,12 +410,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, ...@@ -410,12 +410,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
if (!in_fence) if (!in_fence)
return -EINVAL; return -EINVAL;
/* TODO if we get an array-fence due to userspace merging multiple /*
* fences, we need a way to determine if all the backing fences * Wait if the fence is from a foreign context, or if the fence
* are from our own context.. * array contains any fence from a foreign context.
*/ */
if (!dma_fence_match_context(in_fence, gpu->fctx->context)) {
if (in_fence->context != gpu->fctx->context) {
ret = dma_fence_wait(in_fence, true); ret = dma_fence_wait(in_fence, true);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment