linux-toradex.git/drivers/dma-buf, branch v4.14-rc3

dma-buf: fix reservation_object_wait_timeout_rcu to wait correctly v2

2017-08-14T17:01:25+00:00

With hardware resets in mind it is possible that all shared fences are
signaled, but the exlusive isn't. Fix waiting for everything in this situation.

v2: make sure we always wait for the exclusive fence

Acked-by: Sumit Semwal 
Signed-off-by: Christian König 
Reviewed-by: Alex Deucher 
Reviewed-by: Chunming Zhou 
Signed-off-by: Alex Deucher 
Link: https://patchwork.freedesktop.org/patch/msgid/1502384509-10465-3-git-send-email-alexander.deucher@amd.com

dma-buf: add reservation_object_copy_fences (v2)

2017-08-14T17:00:49+00:00

Allows us to copy all the fences in a reservation object to another one.

v2: handle NULL src_list

Signed-off-by: Christian König 
Reviewed-by: Alex Deucher 
Signed-off-by: Alex Deucher 
Link: https://patchwork.freedesktop.org/patch/msgid/1502384509-10465-2-git-send-email-alexander.deucher@amd.com

dma-buf: dma_fence_put is NULL safe

2017-08-09T19:01:32+00:00

No need to check.

Acked-by: Sumit Semwal 
Signed-off-by: Christian König 
Reviewed-by: Alex Deucher 
Signed-off-by: Alex Deucher 
Link: https://patchwork.freedesktop.org/patch/msgid/1502141543-13455-2-git-send-email-alexander.deucher@amd.com

dma-buf/sw_sync: clean up list before signaling the fence

2017-07-31T17:11:15+00:00

If userspace already dropped its own reference by closing the sw_sync
fence fd we might end up in a deadlock where
dma_fence_is_signaled_locked() will trigger the release of the fence and
thus try to hold the lock to remove the fence from the list.

dma_fence_is_signaled_locked() tries to release/free the fence and hold
the lock in the process.

We fix that by changing the order operation and clean up the list and
rb-tree first.

v2: Drop fence get/put dance and manipulate the list first (Chris Wilson)

Cc: Chris Wilson 
Signed-off-by: Gustavo Padovan 
Reviewed-by: Chris Wilson 
Link: https://patchwork.freedesktop.org/patch/msgid/20170729152217.8362-2-gustavo@padovan.org

dma-buf/sw_sync: move timeline_fence_ops around

2017-07-31T17:10:33+00:00

We are going to use timeline_fence_signaled() in a internal function in
the next commit.

Cc: Chris Wilson 
Signed-off-by: Gustavo Padovan 
Reviewed-by: Chris Wilson 
Link: https://patchwork.freedesktop.org/patch/msgid/20170729152217.8362-1-gustavo@padovan.org

dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence

2017-07-29T14:10:52+00:00

Up until recently sync_file were create to export a single dma-fence to
userspace, and so we could canabalise a bit insie dma-fence to mark
whether or not we had enable polling for the sync_file itself. However,
with the advent of syncobj, we do allow userspace to create multiple
sync_files for a single dma-fence. (Similarly, that the sw-sync
validation framework also started returning multiple sync-files wrapping
a single dma-fence for a syncpt also triggering the problem.)

This patch reverts my suggestion in commit e24165537312
("dma-buf/sync_file: only enable fence signalling on poll()") to use a
single bit in the shared dma-fence and restores the sync_file->flags for
tracking the bits individually.

Reported-by: Gustavo Padovan 
Fixes: f1e8c67123cf ("dma-buf/sw-sync: Use an rbtree to sort fences in the timeline")
Fixes: e9083420bbac ("drm: introduce sync objects (v4)")
Signed-off-by: Chris Wilson 
Cc: Sumit Semwal 
Cc: Sean Paul 
Cc: Gustavo Padovan 
Cc: dri-devel@lists.freedesktop.org
Cc:  # v4.13-rc1+
Signed-off-by: Gustavo Padovan 
Link: http://patchwork.freedesktop.org/patch/msgid/20170728212951.7818-1-chris@chris-wilson.co.uk

Backmerge tag 'v4.13-rc2' into drm-next

2017-07-26T22:15:43+00:00

Linux 4.13-rc2

This is required for drm-misc fixing.

dma-fence: Don't BUG_ON when not absolutely needed

2017-07-26T11:45:07+00:00

It makes debugging a massive pain.

Signed-off-by: Daniel Vetter 
Cc: Sumit Semwal 
Cc: Gustavo Padovan 
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Reviewed-by: Lucas Stach 
Acked-by: Sumit Semwal 
Acked-by: Maarten Lankhorst 
Link: https://patchwork.freedesktop.org/patch/msgid/20170720125107.26693-1-daniel.vetter@ffwll.ch
Signed-off-by: Daniel Vetter

Merge branch 'drm-misc-next-fixes' into drm-misc-fixes

2017-07-17T15:56:07+00:00

Pick up

1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path

From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.

dma-buf/fence: Avoid use of uninitialised timestamp

2017-07-14T19:09:55+00:00

[  236.821534] WARNING: kmemcheck: Caught 64-bit read from uninitialized memory (ffff8802538683d0)
[  236.828642] 420000001e7f0000000000000000000000080000000000000000000000000000
[  236.839543]  i i i i u u u u i i i i i i i i u u u u u u u u u u u u u u u u
[  236.850420]                                  ^
[  236.854123] RIP: 0010:[]  [] fence_signal+0x17/0xd0
[  236.861313] RSP: 0018:ffff88024acd7ba0  EFLAGS: 00010282
[  236.865027] RAX: ffffffff812f6a90 RBX: ffff8802527ca800 RCX: ffff880252cb30e0
[  236.868801] RDX: ffff88024ac5d918 RSI: ffff880252f780e0 RDI: ffff880253868380
[  236.872579] RBP: ffff88024acd7bc0 R08: ffff88024acd7be0 R09: 0000000000000000
[  236.876407] R10: 0000000000000000 R11: 0000000000000000 R12: ffff880253868380
[  236.880185] R13: ffff8802538684d0 R14: ffff880253868380 R15: ffff88024cd48e00
[  236.883983] FS:  00007f1646d1a740(0000) GS:ffff88025d000000(0000) knlGS:0000000000000000
[  236.890959] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  236.894702] CR2: ffff880251360318 CR3: 000000024ad21000 CR4: 00000000001406f0
[  236.898481]  [] i915_gem_request_retire+0x1cd/0x230
[  236.902439]  [] i915_gem_request_alloc+0xa3/0x2f0
[  236.906435]  [] i915_gem_do_execbuffer.isra.41+0xb6d/0x18b0
[  236.910434]  [] i915_gem_execbuffer2+0x95/0x1e0
[  236.914390]  [] drm_ioctl+0x1e5/0x460
[  236.918275]  [] do_vfs_ioctl+0x8f/0x5c0
[  236.922168]  [] SyS_ioctl+0x3c/0x70
[  236.926090]  [] entry_SYSCALL_64_fastpath+0x17/0x93
[  236.930045]  [] 0xffffffffffffffff

We only set the timestamp before we mark the fence as signaled. It is
done before to avoid observers having a window in which they may see the
fence as complete but no timestamp. Having it does incur a potential for
the timestamp to be written twice, and even for it to be corrupted if
the u64 write is not atomic. Instead use a new bit to record the
presence of the timestamp, and teach the readers to wait until it is set
if the fence is complete. There still remains a race where the timestamp
for the signaled fence may be shown before the fence is reported as
signaled, but that's a pre-existing error.

Signed-off-by: Chris Wilson 
Cc: Sumit Semwal 
Cc: Gustavo Padovan 
Cc: Daniel Vetter 
Reported-by: Rafael Antognolli 
Signed-off-by: Gustavo Padovan 
Link: http://patchwork.freedesktop.org/patch/msgid/20170214124001.1930-1-chris@chris-wilson.co.uk