diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:45 +1000 |
| commit | 31649ecf47a44e02e73bffc5680c8f56d6cf587a (patch) | |
| tree | d59914684674c64bb608fc01b65d7a05f4080c5b /drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | |
| parent | 57113c0170b9efeacb3e3e9d4c2178c30d9cd991 (diff) | |
| download | linux-stable-31649ecf47a44e02e73bffc5680c8f56d6cf587a.tar.gz linux-stable-31649ecf47a44e02e73bffc5680c8f56d6cf587a.tar.bz2 linux-stable-31649ecf47a44e02e73bffc5680c8f56d6cf587a.zip | |
drm/nouveau/tmr: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device/user.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c index c5da091c058c..a9df61bf3780 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c @@ -118,14 +118,13 @@ static int nvkm_udevice_time(struct nvkm_udevice *udev, void *data, u32 size) { struct nvkm_device *device = udev->device; - struct nvkm_timer *tmr = device->timer; union { struct nv_device_time_v0 v0; } *args = data; int ret; if (nvif_unpack(args->v0, 0, 0, false)) { - args->v0.time = tmr->read(tmr); + args->v0.time = nvkm_timer_read(device->timer); } return ret; |