drm/nouveau: drop use of DRM_UDELAY

[linux.git] / drivers / gpu / drm / nouveau / nouveau_dma.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 945afd34138edc06efe504d1be6583c8cb76c050..3c430a550a514c3310630f7be78a90fe2006eea3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -101,7 +101,7 @@ nv50_dma_push(struct nouveau_channel *chan, u64 offset, int length)
 
        nvif_wr32(&chan->user, 0x8c, chan->dma.ib_put);
        if (user->func && user->func->doorbell)
-               user->func->doorbell(user, chan->chid);
+               user->func->doorbell(user, chan->token);
        chan->dma.ib_free--;
 }
 
@@ -118,7 +118,7 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count)
                }
 
                if ((++cnt & 0xff) == 0) {
-                       DRM_UDELAY(1);
+                       udelay(1);
                        if (cnt > 100000)
                                return -EBUSY;
                }