aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvif
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:16 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:33 +1000
commitd61f4c178cb36a7b15871fcc60814f1f94a5044d (patch)
tree469d6ef1c795c9af5df43f582c033397a651de0b /drivers/gpu/drm/nouveau/nvif
parentdrm/nouveau/nvif: replace pushbuf with vm in fermi/kepler gpfifo class args (diff)
downloadlinux-dev-d61f4c178cb36a7b15871fcc60814f1f94a5044d.tar.xz
linux-dev-d61f4c178cb36a7b15871fcc60814f1f94a5044d.zip
drm/nouveau/nvif: device time mthd
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvif')
-rw-r--r--drivers/gpu/drm/nouveau/nvif/device.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/device.c b/drivers/gpu/drm/nouveau/nvif/device.c
index 561fb9d7b155..252d8c33215b 100644
--- a/drivers/gpu/drm/nouveau/nvif/device.c
+++ b/drivers/gpu/drm/nouveau/nvif/device.c
@@ -27,7 +27,11 @@
u64
nvif_device_time(struct nvif_device *device)
{
- return nvxx_timer(device)->read(nvxx_timer(device));
+ struct nv_device_time_v0 args = {};
+ int ret = nvif_object_mthd(&device->object, NV_DEVICE_V0_TIME,
+ &args, sizeof(args));
+ WARN_ON_ONCE(ret != 0);
+ return args.time;
}
void