aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:09 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:16 +1000
commitc44c049f28dbebfb95aca3847fd4996ca3503b0c (patch)
tree3d6aa71b5686276af5a2ec95939485375cb47132 /drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
parent5718ea3257f5fb945a8625dd17d0d753c9dbec34 (diff)
downloadlinux-stericsson-c44c049f28dbebfb95aca3847fd4996ca3503b0c.tar.gz
drm/nouveau/tmr: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
index 216f44f9ca7a..c59b2353683b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
@@ -27,12 +27,13 @@ bool
nvkm_timer_wait_eq(void *obj, u64 nsec, u32 addr, u32 mask, u32 data)
{
struct nvkm_timer *ptimer = nvkm_timer(obj);
+ struct nvkm_device *device = ptimer->subdev.device;
u64 time0;
time0 = ptimer->read(ptimer);
do {
if (nv_iclass(obj, NV_SUBDEV_CLASS)) {
- if ((nv_rd32(obj, addr) & mask) == data)
+ if ((nvkm_rd32(device, addr) & mask) == data)
return true;
} else {
if ((nv_ro32(obj, addr) & mask) == data)
@@ -47,12 +48,13 @@ bool
nvkm_timer_wait_ne(void *obj, u64 nsec, u32 addr, u32 mask, u32 data)
{
struct nvkm_timer *ptimer = nvkm_timer(obj);
+ struct nvkm_device *device = ptimer->subdev.device;
u64 time0;
time0 = ptimer->read(ptimer);
do {
if (nv_iclass(obj, NV_SUBDEV_CLASS)) {
- if ((nv_rd32(obj, addr) & mask) != data)
+ if ((nvkm_rd32(device, addr) & mask) != data)
return true;
} else {
if ((nv_ro32(obj, addr) & mask) != data)