Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / drivers / gpu / drm / nouveau / core / engine / fifo / nve0.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 09644fa9602ca09d7a788d147465a3dbd5dbd17c..8e8121abe31b5b9153ce745ed5b076feb811f3a9 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -29,7 +29,6 @@
 #include <core/engctx.h>
 #include <core/event.h>
 #include <core/class.h>
-#include <core/math.h>
 #include <core/enum.h>
 
 #include <subdev/timer.h>
@@ -240,7 +239,7 @@ nve0_fifo_chan_ctor(struct nouveau_object *parent,
 
        usermem = chan->base.chid * 0x200;
        ioffset = args->ioffset;
-       ilength = log2i(args->ilength / 8);
+       ilength = order_base_2(args->ilength / 8);
 
        for (i = 0; i < 0x200; i += 4)
                nv_wo32(priv->user.mem, usermem + i, 0x00000000);