Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / nvkm / engine / fifo / gpfifonv50.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
index c5a7de9db2596279f608d7a5907896f11494504b..d8f28ec1e4a81f71fa917455e3ffa30cce09aedb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
@@ -45,10 +45,10 @@ nv50_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
 
        nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
        if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
-               nvif_ioctl(parent, "create channel gpfifo vers %d vm %llx "
+               nvif_ioctl(parent, "create channel gpfifo vers %d vmm %llx "
                                   "pushbuf %llx ioffset %016llx "
                                   "ilength %08x\n",
-                          args->v0.version, args->v0.vm, args->v0.pushbuf,
+                          args->v0.version, args->v0.vmm, args->v0.pushbuf,
                           args->v0.ioffset, args->v0.ilength);
                if (!args->v0.pushbuf)
                        return -EINVAL;
@@ -59,7 +59,7 @@ nv50_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
                return -ENOMEM;
        *pobject = &chan->base.object;
 
-       ret = nv50_fifo_chan_ctor(fifo, args->v0.vm, args->v0.pushbuf,
+       ret = nv50_fifo_chan_ctor(fifo, args->v0.vmm, args->v0.pushbuf,
                                  oclass, chan);
        if (ret)
                return ret;