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

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
index dfc27a0..b2da05d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
@@ -106,7 +106,10 @@ g84_fifo_context_detach(struct nvkm_object *parent, bool suspend,
 
        save = nvkm_mask(device, 0x002520, 0x0000003f, 1 << engn);
        nvkm_wr32(device, 0x0032fc, nv_gpuobj(base)->addr >> 12);
-       done = nv_wait_ne(fifo, 0x0032fc, 0xffffffff, 0xffffffff);
+       done = nvkm_msec(device, 2000,
+               if (nvkm_rd32(device, 0x0032fc) != 0xffffffff)
+                       break;
+       ) >= 0;
        nvkm_wr32(device, 0x002520, save);
        if (!done) {
                nv_error(fifo, "channel %d [%s] unload timeout\n",

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
index f714bda..503ea80 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
@@ -166,7 +166,10 @@ gf100_fifo_context_detach(struct nvkm_object *parent, bool suspend,
        }
 
        nvkm_wr32(device, 0x002634, chan->base.chid);
-       if (!nv_wait(fifo, 0x002634, 0xffffffff, chan->base.chid)) {
+       if (nvkm_msec(device, 2000,
+               if (nvkm_rd32(device, 0x002634) == chan->base.chid)
+                       break;
+       ) < 0) {
                nv_error(fifo, "channel %d [%s] kick timeout\n",
                         chan->base.chid, nvkm_client_name(chan));
                if (suspend)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index cec1281..cc81511 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -174,7 +174,10 @@ gk104_fifo_chan_kick(struct gk104_fifo_chan *chan)
        struct nvkm_device *device = fifo->base.engine.subdev.device;
 
        nvkm_wr32(device, 0x002634, chan->base.chid);
-       if (!nv_wait(fifo, 0x002634, 0x100000, 0x000000)) {
+       if (nvkm_msec(device, 2000,
+               if (!(nvkm_rd32(device, 0x002634) & 0x00100000))
+                       break;
+       ) < 0) {
                nv_error(fifo, "channel %d [%s] kick timeout\n",
                         chan->base.chid, nvkm_client_name(chan));
                return -EBUSY;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
index 6339b47..214bf12 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
@@ -321,9 +321,11 @@ __acquires(fifo->base.lock)
         * to avoid this, we invalidate the most recently calculated
         * instance.
         */
-       if (!nv_wait(fifo, NV04_PFIFO_CACHE1_PULL0,
-                          NV04_PFIFO_CACHE1_PULL0_HASH_BUSY, 0x00000000))
-               nv_warn(fifo, "timeout idling puller\n");
+       nvkm_msec(device, 2000,
+               u32 tmp = nvkm_rd32(device, NV04_PFIFO_CACHE1_PULL0);
+               if (!(tmp & NV04_PFIFO_CACHE1_PULL0_HASH_BUSY))
+                       break;
+       );
 
        if (nvkm_rd32(device, NV04_PFIFO_CACHE1_PULL0) &
                          NV04_PFIFO_CACHE1_PULL0_HASH_FAILED)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
index 3a868f9..e0188a6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
@@ -135,7 +135,10 @@ nv50_fifo_context_detach(struct nvkm_object *parent, bool suspend,
 
        /* do the kickoff... */
        nvkm_wr32(device, 0x0032fc, nv_gpuobj(base)->addr >> 12);
-       if (!nv_wait_ne(fifo, 0x0032fc, 0xffffffff, 0xffffffff)) {
+       if (nvkm_msec(device, 2000,
+               if (nvkm_rd32(device, 0x0032fc) != 0xffffffff)
+                       break;
+       ) < 0) {
                nv_error(fifo, "channel %d [%s] unload timeout\n",
                         chan->base.chid, nvkm_client_name(chan));
                if (suspend)