diff options
| author | Christoph Bumiller <[email protected]> | 2012-07-12 13:59:52 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2012-07-13 17:28:00 +0200 |
| commit | 9ed65301e044711de0db51b4986085fca170d764 (patch) | |
| tree | e83ec0d3f359713913086a38742d2f6300b169c3 /src/gallium/drivers/nouveau | |
| parent | 426a23af147720ae3b89995ffee792a29e8ae2db (diff) | |
nouveau: implement missing timer query functionality
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_screen.c | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_screen.h | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c index 9baa68ce151..d129a55b387 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.c +++ b/src/gallium/drivers/nouveau/nouveau_screen.c @@ -8,10 +8,14 @@ #include "util/u_format_s3tc.h" #include "util/u_string.h" +#include "os/os_time.h" + #include <stdio.h> #include <errno.h> #include <stdlib.h> +#include <libdrm/nouveau_drm.h> + #include "nouveau_winsys.h" #include "nouveau_screen.h" #include "nouveau_fence.h" @@ -39,6 +43,16 @@ nouveau_screen_get_vendor(struct pipe_screen *pscreen) return "nouveau"; } +static uint64_t +nouveau_screen_get_timestamp(struct pipe_screen *pscreen) +{ + int64_t cpu_time = os_time_get() * 1000; + + /* getparam of PTIMER_TIME takes about x10 as long (several usecs) */ + + return cpu_time + nouveau_screen(pscreen)->cpu_gpu_time_delta; +} + static void nouveau_screen_fence_ref(struct pipe_screen *pscreen, struct pipe_fence_handle **ptr, @@ -108,6 +122,7 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev) struct pipe_screen *pscreen = &screen->base; struct nv04_fifo nv04_data = { .vram = 0xbeef0201, .gart = 0xbeef0202 }; struct nvc0_fifo nvc0_data = { }; + uint64_t time; int size, ret; void *data; union nouveau_bo_config mm_config; @@ -139,9 +154,18 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev) if (ret) return ret; + /* getting CPU time first appears to be more accurate */ + screen->cpu_gpu_time_delta = os_time_get(); + + ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_PTIMER_TIME, &time); + if (!ret) + screen->cpu_gpu_time_delta = time - screen->cpu_gpu_time_delta * 1000; + pscreen->get_name = nouveau_screen_get_name; pscreen->get_vendor = nouveau_screen_get_vendor; + pscreen->get_timestamp = nouveau_screen_get_timestamp; + pscreen->fence_reference = nouveau_screen_fence_ref; pscreen->fence_signalled = nouveau_screen_fence_signalled; pscreen->fence_finish = nouveau_screen_fence_finish; diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h index 5a3cfab92e9..335b95820ab 100644 --- a/src/gallium/drivers/nouveau/nouveau_screen.h +++ b/src/gallium/drivers/nouveau/nouveau_screen.h @@ -39,6 +39,8 @@ struct nouveau_screen { struct nouveau_mman *mm_VRAM; struct nouveau_mman *mm_GART; + + int64_t cpu_gpu_time_delta; }; static INLINE struct nouveau_screen * |