diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:16 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:33 +0300 |
commit | d61f4c178cb36a7b15871fcc60814f1f94a5044d (patch) | |
tree | 469d6ef1c795c9af5df43f582c033397a651de0b /drivers/gpu/drm/nouveau/include | |
parent | 159045cdc460794df27e2cc624a9641be5c54b23 (diff) | |
download | linux-d61f4c178cb36a7b15871fcc60814f1f94a5044d.tar.xz |
drm/nouveau/nvif: device time mthd
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/class.h | 7 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/device.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h index e11b5acb35e7..d52b27ac33ff 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/class.h +++ b/drivers/gpu/drm/nouveau/include/nvif/class.h @@ -129,6 +129,7 @@ struct nv_device_v0 { }; #define NV_DEVICE_V0_INFO 0x00 +#define NV_DEVICE_V0_TIME 0x01 struct nv_device_info_v0 { __u8 version; @@ -157,6 +158,12 @@ struct nv_device_info_v0 { char name[64]; }; +struct nv_device_time_v0 { + __u8 version; + __u8 pad01[7]; + __u64 time; +}; + /******************************************************************************* * context dma diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index 68b431b24ae6..68196f4874f8 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h @@ -57,7 +57,6 @@ u64 nvif_device_time(struct nvif_device *); #define nvxx_gpio(a) nvkm_gpio(nvxx_device(a)) #define nvxx_clk(a) nvkm_clk(nvxx_device(a)) #define nvxx_i2c(a) nvkm_i2c(nvxx_device(a)) -#define nvxx_timer(a) nvkm_timer(nvxx_device(a)) #define nvxx_therm(a) nvkm_therm(nvxx_device(a)) #include <core/device.h> |