drm/nouveau: new gem pushbuf interface, bump to 0.0.16

[net-next-2.6.git] / drivers / gpu / drm / nouveau / nouveau_dma.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index da6e16dafa4dfefee73a6d030071128941da6b37..8b05c15866d5b9ad83bc52f78378944f90412fe9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -32,7 +32,7 @@
 #endif
 
 void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
-                  int delta, int dwords);
+                  int delta, int length);
 
 /*
  * There's a hw race condition where you can't jump to your PUT offset,
@@ -149,7 +149,7 @@ FIRE_RING(struct nouveau_channel *chan)
 
        if (chan->dma.ib_max) {
                nv50_dma_push(chan, chan->pushbuf_bo, chan->dma.put << 2,
-                             chan->dma.cur - chan->dma.put);
+                             (chan->dma.cur - chan->dma.put) << 2);
        } else {
                WRITE_PUT(chan->dma.cur);
        }