drm/nouveau/ibus: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
index 1b676aaecc88994de47b41510330fb449b620cc8..611fc7165469b1a0da98ee95ed57221341d1aa25 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
@@ -59,9 +59,10 @@ gk20a_ibus_intr(struct nvkm_subdev *subdev)
 
        /* Acknowledge interrupt */
        nvkm_mask(device, 0x12004c, 0x2, 0x2);
-
-       if (!nv_wait(subdev, 0x12004c, 0x3f, 0x00))
-               nv_warn(ibus, "timeout waiting for ringmaster ack\n");
+       nvkm_msec(device, 2000,
+               if (!(nvkm_rd32(device, 0x12004c) & 0x0000003f))
+                       break;
+       );
 }
 
 static int