@@ -32,26 +32,7 @@
int etna_pipe_wait(struct etna_pipe *pipe, uint32_t timestamp, uint32_t ms)
{
- struct etna_device *dev = pipe->gpu->dev;
- int ret;
-
- struct drm_etnaviv_wait_fence req = {
- .pipe = pipe->gpu->core,
- .fence = timestamp,
- };
-
- if (ms == 0)
- req.flags |= ETNA_WAIT_NONBLOCK;
-
- get_abs_timeout(&req.timeout, ms);
-
- ret = drmCommandWrite(dev->fd, DRM_ETNAVIV_WAIT_FENCE, &req, sizeof(req));
- if (ret) {
- ERROR_MSG("wait-fence failed! %d (%s)", ret, strerror(errno));
- return ret;
- }
-
- return 0;
+ return etna_pipe_wait_ns(pipe, timestamp, ms * 1000000);
}
int etna_pipe_wait_ns(struct etna_pipe *pipe, uint32_t timestamp, uint64_t ns)
We can make use of etna_pipe_wait_ns(..). Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> --- etnaviv/etnaviv_pipe.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)