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

etnaviv: change get_abs_timeout(..) to use ns. 

Also update all callers.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
main
Christian Gmeiner 2016-11-23 22:02:25 +01:00
parent 1924b6704a
commit 4f750ec756
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etnaviv/etnaviv_bo.c
View File

@ -330,7 +330,7 @@ int etna_bo_cpu_prep(struct etna_bo *bo, uint32_t op)
.op = op, .op = op,
}; };
get_abs_timeout(&req.timeout, 5000); get_abs_timeout(&req.timeout, 5000000000);
return drmCommandWrite(bo->dev->fd, DRM_ETNAVIV_GEM_CPU_PREP, return drmCommandWrite(bo->dev->fd, DRM_ETNAVIV_GEM_CPU_PREP,
&req, sizeof(req)); &req, sizeof(req));

2
etnaviv/etnaviv_pipe.c
View File

@ -43,7 +43,7 @@ int etna_pipe_wait(struct etna_pipe *pipe, uint32_t timestamp, uint32_t ms)
if (ms == 0) if (ms == 0)
req.flags |= ETNA_WAIT_NONBLOCK; req.flags |= ETNA_WAIT_NONBLOCK;
get_abs_timeout(&req.timeout, ms); get_abs_timeout(&req.timeout, ms * 1000000);
ret = drmCommandWrite(dev->fd, DRM_ETNAVIV_WAIT_FENCE, &req, sizeof(req)); ret = drmCommandWrite(dev->fd, DRM_ETNAVIV_WAIT_FENCE, &req, sizeof(req));
if (ret) { if (ret) {

6
etnaviv/etnaviv_priv.h
View File

@ -189,13 +189,13 @@ struct etna_cmd_stream_priv {
#define VOID2U64(x) ((uint64_t)(unsigned long)(x)) #define VOID2U64(x) ((uint64_t)(unsigned long)(x))
static inline void get_abs_timeout(struct drm_etnaviv_timespec *tv, uint32_t ms) static inline void get_abs_timeout(struct drm_etnaviv_timespec *tv, uint64_t ns)
{ {
struct timespec t; struct timespec t;
uint32_t s = ms / 1000; uint32_t s = ns / 1000000000;
clock_gettime(CLOCK_MONOTONIC, &t); clock_gettime(CLOCK_MONOTONIC, &t);
tv->tv_sec = t.tv_sec + s; tv->tv_sec = t.tv_sec + s;
tv->tv_nsec = t.tv_nsec + ((ms - (s * 1000)) * 1000000); tv->tv_nsec = t.tv_nsec + ns - (s * 1000000000);
} }
#endif /* ETNAVIV_PRIV_H_ */ #endif /* ETNAVIV_PRIV_H_ */