diff options
| author |   Sinclair Yeh <syeh@vmware.com> | 2017-07-05 01:45:40 -0700 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-08-28 17:51:38 +0200 |
| commit | 585851164660e8dff961178a9533857b21d63975 (patch) | |
| tree | c16506b1862c5f168cfe501c867097d80899e3d5 /drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | |
| parent | drm/vmwgfx: Prepare to support fence fd (diff) | |
| download | linux-dev-585851164660e8dff961178a9533857b21d63975.tar.xz linux-dev-585851164660e8dff961178a9533857b21d63975.zip | |
drm/vmwgfx: Add support for imported Fence File Descriptor
This allows vmwgfx to wait on a fence created by another
device.
v2:
* Remove special handling for vmwgfx fence and just use dma_fence_wait()
* Use interruptible waits
* Added function documentation
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Singh Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fence.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h index d9d85aa6ed20..20224dba9d8e 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h @@ -28,6 +28,7 @@ #ifndef _VMWGFX_FENCE_H_ #include <linux/dma-fence.h> +#include <linux/dma-fence-array.h> #define VMW_FENCE_WAIT_TIMEOUT (5*HZ) @@ -102,6 +103,9 @@ extern int vmw_user_fence_create(struct drm_file *file_priv, struct vmw_fence_obj **p_fence, uint32_t *p_handle); +extern int vmw_wait_dma_fence(struct vmw_fence_manager *fman, + struct dma_fence *fence); + extern void vmw_fence_fifo_up(struct vmw_fence_manager *fman); extern void vmw_fence_fifo_down(struct vmw_fence_manager *fman); |