diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-04-09 12:01:00 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-04-09 19:52:03 +0100 |
| commit | 5de376bb434f80a13138f0ebedc8351ab73d8b0d (patch) | |
| tree | ffaaba4b130e7f4e1116a291d89bd719ba12dca0 /drivers/dma-buf/dma-fence-chain.c | |
| parent | dma-buf: Prettify typecasts for dma-fence-chain (diff) | |
| download | linux-dev-5de376bb434f80a13138f0ebedc8351ab73d8b0d.tar.xz linux-dev-5de376bb434f80a13138f0ebedc8351ab73d8b0d.zip | |
dma-buf: Report signaled links inside dma-fence-chain
Whenever we walk along the dma-fence-chain, we prune signaled links to
keep the chain nice and tidy. This leads to situations where we can
prune a link and report the earlier fence as the target seqno --
violating our own consistency checks that the seqno is not more advanced
than the last element in a dma-fence-chain.
Report a NULL fence and success if the seqno has already been signaled.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Reviewed-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200409110101.18400-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/dma-buf/dma-fence-chain.c')
| -rw-r--r-- | drivers/dma-buf/dma-fence-chain.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c index 3d123502ff12..c435bbba851c 100644 --- a/drivers/dma-buf/dma-fence-chain.c +++ b/drivers/dma-buf/dma-fence-chain.c @@ -99,6 +99,12 @@ int dma_fence_chain_find_seqno(struct dma_fence **pfence, uint64_t seqno) return -EINVAL; dma_fence_chain_for_each(*pfence, &chain->base) { + if ((*pfence)->seqno < seqno) { /* already signaled */ + dma_fence_put(*pfence); + *pfence = NULL; + break; + } + if ((*pfence)->context != chain->base.context || to_dma_fence_chain(*pfence)->prev_seqno < seqno) break; @@ -222,6 +228,7 @@ EXPORT_SYMBOL(dma_fence_chain_ops); * @chain: the chain node to initialize * @prev: the previous fence * @fence: the current fence + * @seqno: the sequence number (syncpt) of the fence within the chain * * Initialize a new chain node and either start a new chain or add the node to * the existing chain of the previous fence. |