浏览代码

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 10 年之前
父节点
当前提交
63bb5c390b
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c

+ 4 - 3
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