geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Support passing of explicit fencing from execbuf 

Allow the caller to pass in an fd to an array of fences to control
serialisation of the execbuf in the kernel and on the GPU, and in return
allow creation of a fence fd for signaling the completion (and flushing)
of the batch. When the returned fence is signaled, all writes to the
buffers inside the batch will be complete and coherent from the cpu, or
other consumers. The return fence is a sync_file object and can be
passed to other users (such as atomic modesetting, or other drivers).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
main
Chris Wilson 2016-08-20 12:38:46 +01:00
parent 1bd35da961
commit c4b00767a7
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intel/intel_bufmgr.h
View File

@ -221,6 +221,12 @@ int drm_intel_gem_context_get_id(drm_intel_context *ctx,
void drm_intel_gem_context_destroy(drm_intel_context *ctx); void drm_intel_gem_context_destroy(drm_intel_context *ctx);
int drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx, int drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx,
int used, unsigned int flags); int used, unsigned int flags);
int drm_intel_gem_bo_fence_exec(drm_intel_bo *bo,
drm_intel_context *ctx,
int used,
int in_fence,
int *out_fence,
unsigned int flags);
int drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd); int drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd);
drm_intel_bo *drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, drm_intel_bo *drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr,

31
intel/intel_bufmgr_gem.c
View File

@ -2376,6 +2376,7 @@ drm_intel_gem_bo_exec(drm_intel_bo *bo, int used,
static int static int
do_exec2(drm_intel_bo *bo, int used, drm_intel_context *ctx, do_exec2(drm_intel_bo *bo, int used, drm_intel_context *ctx,
drm_clip_rect_t *cliprects, int num_cliprects, int DR4, drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
int in_fence, int *out_fence,
unsigned int flags) unsigned int flags)
{ {
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr; drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr;
@ -2430,12 +2431,20 @@ do_exec2(drm_intel_bo *bo, int used, drm_intel_context *ctx,
else else
i915_execbuffer2_set_context_id(execbuf, ctx->ctx_id); i915_execbuffer2_set_context_id(execbuf, ctx->ctx_id);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
if (in_fence != -1) {
execbuf.rsvd2 = in_fence;
execbuf.flags |= I915_EXEC_FENCE_IN;
}
if (out_fence != NULL) {
*out_fence = -1;
execbuf.flags |= I915_EXEC_FENCE_OUT;
}
if (bufmgr_gem->no_exec) if (bufmgr_gem->no_exec)
goto skip_execution; goto skip_execution;
ret = drmIoctl(bufmgr_gem->fd, ret = drmIoctl(bufmgr_gem->fd,
DRM_IOCTL_I915_GEM_EXECBUFFER2, DRM_IOCTL_I915_GEM_EXECBUFFER2_WR,
&execbuf); &execbuf);
if (ret != 0) { if (ret != 0) {
ret = -errno; ret = -errno;
@ -2451,6 +2460,9 @@ do_exec2(drm_intel_bo *bo, int used, drm_intel_context *ctx,
} }
drm_intel_update_buffer_offsets2(bufmgr_gem); drm_intel_update_buffer_offsets2(bufmgr_gem);
if (ret == 0 && out_fence != NULL)
*out_fence = execbuf.rsvd2 >> 32;
skip_execution: skip_execution:
if (bufmgr_gem->bufmgr.debug) if (bufmgr_gem->bufmgr.debug)
drm_intel_gem_dump_validation_list(bufmgr_gem); drm_intel_gem_dump_validation_list(bufmgr_gem);
@ -2476,7 +2488,7 @@ drm_intel_gem_bo_exec2(drm_intel_bo *bo, int used,
int DR4) int DR4)
{ {
return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4, return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4,
I915_EXEC_RENDER); -1, NULL, I915_EXEC_RENDER);
} }
static int static int
@ -2485,14 +2497,25 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used,
unsigned int flags) unsigned int flags)
{ {
return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4, return do_exec2(bo, used, NULL, cliprects, num_cliprects, DR4,
flags); -1, NULL, flags);
} }
int int
drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx, drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx,
int used, unsigned int flags) int used, unsigned int flags)
{ {
return do_exec2(bo, used, ctx, NULL, 0, 0, flags); return do_exec2(bo, used, ctx, NULL, 0, 0, -1, NULL, flags);
}
int
drm_intel_gem_bo_fence_exec(drm_intel_bo *bo,
drm_intel_context *ctx,
int used,
int in_fence,
int *out_fence,
unsigned int flags)
{
return do_exec2(bo, used, ctx, NULL, 0, 0, in_fence, out_fence, flags);
} }
static int static int