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

etnaviv: add fence fd support 

Add etna_cmd_stream_flush2 with in-fence fd and out-fence fd support for
explicit fencing.

v3: added etna_cmd_stream_flush2 to etnaviv/etnaviv-symbol-check

v2: renamed etna_cmd_stream_flush_explicit to etna_cmd_stream_flush2

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
main
Philipp Zabel 2017-04-10 11:15:53 +02:00 committed by Lucas Stach
parent 26e51e413b
commit 2f902a6844
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etnaviv/etnaviv-symbol-check
View File

@ -39,6 +39,7 @@ etna_cmd_stream_new
etna_cmd_stream_del etna_cmd_stream_del
etna_cmd_stream_timestamp etna_cmd_stream_timestamp
etna_cmd_stream_flush etna_cmd_stream_flush
etna_cmd_stream_flush2
etna_cmd_stream_finish etna_cmd_stream_finish
etna_cmd_stream_reloc etna_cmd_stream_reloc
EOF EOF

33
etnaviv/etnaviv_cmd_stream.c
View File

@ -177,7 +177,8 @@ static uint32_t bo2idx(struct etna_cmd_stream *stream, struct etna_bo *bo,
return idx; return idx;
} }
static void flush(struct etna_cmd_stream *stream) static void flush(struct etna_cmd_stream *stream, int in_fence_fd,
int *out_fence_fd)
{ {
struct etna_cmd_stream_priv *priv = etna_cmd_stream_priv(stream); struct etna_cmd_stream_priv *priv = etna_cmd_stream_priv(stream);
int ret, id = priv->pipe->id; int ret, id = priv->pipe->id;
@ -194,8 +195,22 @@ static void flush(struct etna_cmd_stream *stream)
.stream_size = stream->offset * 4, /* in bytes */ .stream_size = stream->offset * 4, /* in bytes */
}; };
if (in_fence_fd != -1) {
req.flags |= ETNA_SUBMIT_FENCE_FD_IN | ETNA_SUBMIT_NO_IMPLICIT;
req.fence_fd = in_fence_fd;
}
if (out_fence_fd)
req.flags |= ETNA_SUBMIT_FENCE_FD_OUT;
/*
* Pass the complete submit structure only if flags are set. Otherwise,
* only pass the fields up to, but not including the flags field for
* backwards compatiblity with older kernels.
*/
ret = drmCommandWriteRead(gpu->dev->fd, DRM_ETNAVIV_GEM_SUBMIT, ret = drmCommandWriteRead(gpu->dev->fd, DRM_ETNAVIV_GEM_SUBMIT,
&req, sizeof(req)); &req, req.flags ? sizeof(req) :
offsetof(struct drm_etnaviv_gem_submit, flags));
if (ret) if (ret)
ERROR_MSG("submit failed: %d (%s)", ret, strerror(errno)); ERROR_MSG("submit failed: %d (%s)", ret, strerror(errno));
@ -208,11 +223,21 @@ static void flush(struct etna_cmd_stream *stream)
bo->current_stream = NULL; bo->current_stream = NULL;
etna_bo_del(bo); etna_bo_del(bo);
} }
if (out_fence_fd)
*out_fence_fd = req.fence_fd;
} }
void etna_cmd_stream_flush(struct etna_cmd_stream *stream) void etna_cmd_stream_flush(struct etna_cmd_stream *stream)
{ {
flush(stream); flush(stream, -1, NULL);
reset_buffer(stream);
}
void etna_cmd_stream_flush2(struct etna_cmd_stream *stream, int in_fence_fd,
int *out_fence_fd)
{
flush(stream, in_fence_fd, out_fence_fd);
reset_buffer(stream); reset_buffer(stream);
} }
@ -220,7 +245,7 @@ void etna_cmd_stream_finish(struct etna_cmd_stream *stream)
{ {
struct etna_cmd_stream_priv *priv = etna_cmd_stream_priv(stream); struct etna_cmd_stream_priv *priv = etna_cmd_stream_priv(stream);
flush(stream); flush(stream, -1, NULL);
etna_pipe_wait(priv->pipe, priv->last_timestamp, 5000); etna_pipe_wait(priv->pipe, priv->last_timestamp, 5000);
reset_buffer(stream); reset_buffer(stream);
} }

2
etnaviv/etnaviv_drmif.h
View File

@ -142,6 +142,8 @@ struct etna_cmd_stream *etna_cmd_stream_new(struct etna_pipe *pipe, uint32_t siz
void etna_cmd_stream_del(struct etna_cmd_stream *stream); void etna_cmd_stream_del(struct etna_cmd_stream *stream);
uint32_t etna_cmd_stream_timestamp(struct etna_cmd_stream *stream); uint32_t etna_cmd_stream_timestamp(struct etna_cmd_stream *stream);
void etna_cmd_stream_flush(struct etna_cmd_stream *stream); void etna_cmd_stream_flush(struct etna_cmd_stream *stream);
void etna_cmd_stream_flush2(struct etna_cmd_stream *stream, int in_fence_fd,
int *out_fence_fd);
void etna_cmd_stream_finish(struct etna_cmd_stream *stream); void etna_cmd_stream_finish(struct etna_cmd_stream *stream);
static inline uint32_t etna_cmd_stream_avail(struct etna_cmd_stream *stream) static inline uint32_t etna_cmd_stream_avail(struct etna_cmd_stream *stream)