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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
mariux64 · Aug 28, 2015 · 4f31c84 · 4f31c84
1 parent 4dd308f
commit 4f31c84
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c
@@ -40,7 +40,13 @@ g94_bus_hwsq_exec(struct nvkm_bus *bus, u32 *data, u32 size)
 	nvkm_mask(device, 0x001098, 0x00000018, 0x00000018);
 	nvkm_wr32(device, 0x00130c, 0x00000001);
 
-	return nv_wait(bus, 0x001308, 0x00000100, 0x00000000) ? 0 : -ETIMEDOUT;
+	if (nvkm_msec(device, 2000,
+		if (!(nvkm_rd32(device, 0x001308) & 0x00000100))
+			break;
+	) < 0)
+		return -ETIMEDOUT;
+
+	return 0;
 }
 
 struct nvkm_oclass *

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c
@@ -39,7 +39,13 @@ nv50_bus_hwsq_exec(struct nvkm_bus *bus, u32 *data, u32 size)
 	nvkm_mask(device, 0x001098, 0x00000018, 0x00000018);
 	nvkm_wr32(device, 0x00130c, 0x00000003);
 
-	return nv_wait(bus, 0x001308, 0x00000100, 0x00000000) ? 0 : -ETIMEDOUT;
+	if (nvkm_msec(device, 2000,
+		if (!(nvkm_rd32(device, 0x001308) & 0x00000100))
+			break;
+	) < 0)
+		return -ETIMEDOUT;
+
+	return 0;
 }
 
 void