From: Ben Skeggs Date: Thu, 20 Aug 2015 04:54:11 +0000 (+1000) Subject: drm/nouveau/ibus: switch to new-style timer macros X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=63bb5c390bf2f975f0936b6523af6784af811b49;p=deliverable%2Flinux.git drm/nouveau/ibus: switch to new-style timer macros Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c index 1b676aaecc88..611fc7165469 100644 --- 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