diff options
| author |   Christian König <christian.koenig@amd.com> | 2019-04-15 14:46:34 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2019-04-16 14:49:10 +0200 |
| commit | 5e498abf14858945f1249d9cc4ff1e8715a307e3 (patch) | |
| tree | d8c599a61c51f700fd5dd9ae5d5492ce64e38b45 /drivers/dma-buf/sync_file.c | |
| parent | drm/panfrost: Add support for 2MB page entries (diff) | |
| download | linux-dev-5e498abf14858945f1249d9cc4ff1e8715a307e3.tar.xz linux-dev-5e498abf14858945f1249d9cc4ff1e8715a307e3.zip | |
dma-buf: explicitely note that dma-fence-chains use 64bit seqno
Instead of checking the upper values of the sequence number use an explicit
field in the dma_fence_ops structure to note if a sequence should be 32bit
or 64bit.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/299655/
Diffstat (limited to 'drivers/dma-buf/sync_file.c')
| -rw-r--r-- | drivers/dma-buf/sync_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 4f6305ca52c8..ed3fb6e5224c 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -258,7 +258,8 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, i_b++; } else { - if (__dma_fence_is_later(pt_a->seqno, pt_b->seqno)) + if (__dma_fence_is_later(pt_a->seqno, pt_b->seqno, + pt_a->ops)) add_fence(fences, &i, pt_a); else add_fence(fences, &i, pt_b); |