}
int
-nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool exclusive, bool intr)
+nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
+ bool exclusive, bool intr)
{
struct nouveau_fence_chan *fctx = chan->fence;
- struct dma_fence *fence;
struct dma_resv *resv = nvbo->bo.base.resv;
- struct dma_resv_iter cursor;
- struct dma_fence *fence;
- struct dma_resv_list *fobj;
-- struct nouveau_fence *f;
- int ret;
- int ret = 0, i;
++ int i, ret;
if (!exclusive) {
ret = dma_resv_reserve_shared(resv, 1);
--
if (ret)
return ret;
-
- fobj = NULL;
- } else {
- fobj = dma_resv_shared_list(resv);
}
- dma_resv_for_each_fence(&cursor, resv, exclusive, fence) {
- struct nouveau_channel *prev = NULL;
- bool must_wait = true;
-
- f = nouveau_local_fence(fence, chan->drm);
- if (f) {
- rcu_read_lock();
- prev = rcu_dereference(f->channel);
- if (prev && (prev == chan ||
- fctx->sync(f, prev, chan) == 0))
- must_wait = false;
- rcu_read_unlock();
- }
+ /* Waiting for the exclusive fence first causes performance regressions
+ * under some circumstances. So manually wait for the shared ones first.
+ */
- for (i = 0; i < (fobj ? fobj->shared_count : 0) && !ret; ++i) {
- struct nouveau_channel *prev = NULL;
- bool must_wait = true;
-
- fence = rcu_dereference_protected(fobj->shared[i],
- dma_resv_held(resv));
-
- f = nouveau_local_fence(fence, chan->drm);
- if (f) {
- rcu_read_lock();
- prev = rcu_dereference(f->channel);
- if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
- must_wait = false;
- rcu_read_unlock();
- }
++ for (i = 0; i < 2; ++i) {
++ struct dma_resv_iter cursor;
++ struct dma_fence *fence;
++
++ dma_resv_for_each_fence(&cursor, resv, exclusive, fence) {
++ struct nouveau_fence *f;
++
++ if (i == 0 && dma_resv_iter_is_exclusive(&cursor))
++ continue;
++
++ f = nouveau_local_fence(fence, chan->drm);
++ if (f) {
++ struct nouveau_channel *prev;
++ bool must_wait = true;
++
++ rcu_read_lock();
++ prev = rcu_dereference(f->channel);
++ if (prev && (prev == chan ||
++ fctx->sync(f, prev, chan) == 0))
++ must_wait = false;
++ rcu_read_unlock();
++ if (!must_wait)
++ continue;
++ }
- if (must_wait) {
- if (must_wait)
ret = dma_fence_wait(fence, intr);
- }
-
- fence = dma_resv_excl_fence(resv);
- if (fence) {
- struct nouveau_channel *prev = NULL;
- bool must_wait = true;
-
- f = nouveau_local_fence(fence, chan->drm);
- if (f) {
- rcu_read_lock();
- prev = rcu_dereference(f->channel);
- if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
- must_wait = false;
- rcu_read_unlock();
+ if (ret)
+ return ret;
}
-
- if (must_wait)
- ret = dma_fence_wait(fence, intr);
-
- return ret;
}
- return ret;
+
+ return 0;
}
void