drm/nouveau/nvif: replace path-based object identification

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

14 files changed, 111 insertions, 77 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/client.c b/drivers/gpu/drm/nouveau/nvkm/core/client.c
index 7615cdd75294..bfe5357d7334 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/client.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c
@@ -183,6 +183,55 @@ nvkm_client_oclass = {
         },
 };
 
+void
+nvkm_client_remove(struct nvkm_client *client, struct nvkm_handle *object)
+{
+        if (!RB_EMPTY_NODE(&object->rb))
+                rb_erase(&object->rb, &client->objroot);
+}
+
+bool
+nvkm_client_insert(struct nvkm_client *client, struct nvkm_handle *object)
+{
+        struct rb_node **ptr = &client->objroot.rb_node;
+        struct rb_node *parent = NULL;
+
+        while (*ptr) {
+                struct nvkm_handle *this =
+                        container_of(*ptr, typeof(*this), rb);
+                parent = *ptr;
+                if (object->handle < this->handle)
+                        ptr = &parent->rb_left;
+                else
+                if (object->handle > this->handle)
+                        ptr = &parent->rb_right;
+                else
+                        return false;
+        }
+
+        rb_link_node(&object->rb, parent, ptr);
+        rb_insert_color(&object->rb, &client->objroot);
+        return true;
+}
+
+struct nvkm_handle *
+nvkm_client_search(struct nvkm_client *client, u64 handle)
+{
+        struct rb_node *node = client->objroot.rb_node;
+        while (node) {
+                struct nvkm_handle *object =
+                        container_of(node, typeof(*object), rb);
+                if (handle < object->handle)
+                        node = node->rb_left;
+                else
+                if (handle > object->handle)
+                        node = node->rb_right;
+                else
+                        return object;
+        }
+        return NULL;
+}
+
 int
 nvkm_client_fini(struct nvkm_client *client, bool suspend)
 {
@@ -256,6 +305,7 @@ nvkm_client_new(const char *name, u64 device, const char *cfg,
         client->device = device;
         snprintf(client->name, sizeof(client->name), "%s", name);
         client->debug = nvkm_dbgopt(dbg, "CLIENT");
+        client->objroot = RB_ROOT;
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/handle.c b/drivers/gpu/drm/nouveau/nvkm/core/handle.c
index 6230eaece64d..a12ab8001701 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/handle.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/handle.c
@@ -113,6 +113,7 @@ nvkm_handle_create(struct nvkm_object *parent, u32 _parent, u32 _handle,
         INIT_LIST_HEAD(&handle->tree);
         handle->name = _handle;
         handle->priv = ~0;
+        RB_CLEAR_NODE(&handle->rb);
 
         ret = nvkm_namedb_insert(nv_namedb(namedb), _handle, object, handle);
         if (ret) {
@@ -149,12 +150,15 @@ nvkm_handle_create(struct nvkm_object *parent, u32 _parent, u32 _handle,
 void
 nvkm_handle_destroy(struct nvkm_handle *handle)
 {
+        struct nvkm_client *client = nvkm_client(handle->object);
         struct nvkm_handle *item, *temp;
 
         hprintk(handle, TRACE, "destroy running\n");
         list_for_each_entry_safe(item, temp, &handle->tree, head) {
                 nvkm_handle_destroy(item);
         }
+
+        nvkm_client_remove(client, handle);
         list_del(&handle->head);
 
         if (handle->priv != ~0) {
@@ -167,24 +171,6 @@ nvkm_handle_destroy(struct nvkm_handle *handle)
         kfree(handle);
 }
 
-struct nvkm_object *
-nvkm_handle_ref(struct nvkm_object *parent, u32 name)
-{
-        struct nvkm_object *object = NULL;
-        struct nvkm_handle *handle;
-
-        while (!nv_iclass(parent, NV_NAMEDB_CLASS))
-                parent = parent->parent;
-
-        handle = nvkm_namedb_get(nv_namedb(parent), name);
-        if (handle) {
-                nvkm_object_ref(handle->object, &object);
-                nvkm_namedb_put(handle);
-        }
-
-        return object;
-}
-
 struct nvkm_handle *
 nvkm_handle_get_class(struct nvkm_object *engctx, u16 oclass)
 {
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
index 7434958846f7..7654783e8350 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
@@ -103,9 +103,9 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size)
                 return ret;
 
         nvif_ioctl(handle->object, "new vers %d handle %08x class %08x "
-                                   "route %02x token %llx\n",
+                                   "route %02x token %llx object %016llx\n",
                    args->v0.version, _handle, _oclass,
-                   args->v0.route, args->v0.token);
+                   args->v0.route, args->v0.token, args->v0.object);
 
         if (!nv_iclass(handle->object, NV_PARENT_CLASS)) {
                 nvif_debug(handle->object, "cannot have children (ctor)\n");
@@ -166,6 +166,8 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size)
         if (ret)
                 nvkm_handle_destroy(handle);
 
+        handle->handle = args->v0.object;
+        nvkm_client_insert(client, handle);
 fail_handle:
         nvkm_object_dec(object, false);
 fail_init:
@@ -438,40 +440,31 @@ nvkm_ioctl_v0[] = {
 };
 
 static int
-nvkm_ioctl_path(struct nvkm_handle *parent, u32 type, u32 nr, u32 *path,
+nvkm_ioctl_path(struct nvkm_client *client, u64 handle, u32 type,
                 void *data, u32 size, u8 owner, u8 *route, u64 *token)
 {
-        struct nvkm_handle *handle = parent;
-        struct nvkm_namedb *namedb;
-        struct nvkm_object *object;
+        struct nvkm_handle *object;
         int ret;
 
-        while ((object = parent->object), nr--) {
-                nvif_ioctl(object, "path 0x%08x\n", path[nr]);
-                if (!nv_iclass(object, NV_PARENT_CLASS)) {
-                        nvif_debug(object, "cannot have children (path)\n");
-                        return -EINVAL;
-                }
-
-                if (!(namedb = (void *)nv_pclass(object, NV_NAMEDB_CLASS)) ||
-                    !(handle = nvkm_namedb_get(namedb, path[nr]))) {
-                        nvif_debug(object, "handle 0x%08x not found\n", path[nr]);
-                        return -ENOENT;
-                }
-                nvkm_namedb_put(handle);
-                parent = handle;
+        if (handle)
+                object = nvkm_client_search(client, handle);
+        else
+                object = client->root;
+        if (unlikely(!object)) {
+                nvif_ioctl(&client->namedb.parent.object, "object not found\n");
+                return -ENOENT;
         }
 
-        if (owner != NVIF_IOCTL_V0_OWNER_ANY && owner != handle->route) {
-                nvif_ioctl(object, "object route != owner\n");
+        if (owner != NVIF_IOCTL_V0_OWNER_ANY && owner != object->route) {
+                nvif_ioctl(&client->namedb.parent.object, "route != owner\n");
                 return -EACCES;
         }
-        *route = handle->route;
-        *token = handle->token;
+        *route = object->route;
+        *token = object->token;
 
         if (ret = -EINVAL, type < ARRAY_SIZE(nvkm_ioctl_v0)) {
                 if (nvkm_ioctl_v0[type].version == 0)
-                        ret = nvkm_ioctl_v0[type].func(handle, data, size);
+                        ret = nvkm_ioctl_v0[type].func(object, data, size);
         }
 
         return ret;
@@ -491,11 +484,11 @@ nvkm_ioctl(struct nvkm_client *client, bool supervisor,
         nvif_ioctl(object, "size %d\n", size);
 
         if (nvif_unpack(args->v0, 0, 0, true)) {
-                nvif_ioctl(object, "vers %d type %02x path %d owner %02x\n",
-                           args->v0.version, args->v0.type, args->v0.path_nr,
+                nvif_ioctl(object,
+                           "vers %d type %02x object %016llx owner %02x\n",
+                           args->v0.version, args->v0.type, args->v0.object,
                            args->v0.owner);
-                ret = nvkm_ioctl_path(client->root, args->v0.type,
-                                      args->v0.path_nr, args->v0.path,
+                ret = nvkm_ioctl_path(client, args->v0.object, args->v0.type,
                                       data, size, args->v0.owner,
                                       &args->v0.route, &args->v0.token);
         }
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index 9d7ac6a15bd7..2568e5d5790e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -206,9 +206,12 @@ nv50_disp_dmac_object_detach(struct nvkm_object *parent, int cookie)
 static int
 nv50_disp_dmac_create_(struct nvkm_object *parent,
                        struct nvkm_object *engine,
-                       struct nvkm_oclass *oclass, u32 pushbuf, int head,
+                       struct nvkm_oclass *oclass, u64 pushbuf, int head,
                        int length, void **pobject)
 {
+        struct nvkm_client *client = nvkm_client(parent);
+        struct nvkm_handle *handle;
+        struct nvkm_dmaobj *dmaobj;
         struct nv50_disp_dmac *dmac;
         int ret;
 
@@ -218,22 +221,23 @@ nv50_disp_dmac_create_(struct nvkm_object *parent,
         if (ret)
                 return ret;
 
-        dmac->pushdma = (void *)nvkm_handle_ref(parent, pushbuf);
-        if (!dmac->pushdma)
+        handle = nvkm_client_search(client, pushbuf);
+        if (!handle)
                 return -ENOENT;
+        dmaobj = (void *)handle->object;
 
-        switch (nv_mclass(dmac->pushdma)) {
+        switch (nv_mclass(dmaobj)) {
         case 0x0002:
         case 0x003d:
-                if (dmac->pushdma->limit - dmac->pushdma->start != 0xfff)
+                if (dmaobj->limit - dmaobj->start != 0xfff)
                         return -EINVAL;
 
-                switch (dmac->pushdma->target) {
+                switch (dmaobj->target) {
                 case NV_MEM_TARGET_VRAM:
-                        dmac->push = 0x00000001 | dmac->pushdma->start >> 8;
+                        dmac->push = 0x00000001 | dmaobj->start >> 8;
                         break;
                 case NV_MEM_TARGET_PCI_NOSNOOP:
-                        dmac->push = 0x00000003 | dmac->pushdma->start >> 8;
+                        dmac->push = 0x00000003 | dmaobj->start >> 8;
                         break;
                 default:
                         return -EINVAL;
@@ -250,7 +254,6 @@ void
 nv50_disp_dmac_dtor(struct nvkm_object *object)
 {
         struct nv50_disp_dmac *dmac = (void *)object;
-        nvkm_object_ref(NULL, (struct nvkm_object **)&dmac->pushdma);
         nv50_disp_chan_destroy(&dmac->base);
 }
 
@@ -513,7 +516,7 @@ nv50_disp_core_ctor(struct nvkm_object *parent,
         nvif_ioctl(parent, "create disp core channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
                 nvif_ioctl(parent, "create disp core channel dma vers %d "
-                                   "pushbuf %08x\n",
+                                   "pushbuf %016llx\n",
                            args->v0.version, args->v0.pushbuf);
         } else
                 return ret;
@@ -682,7 +685,7 @@ nv50_disp_base_ctor(struct nvkm_object *parent,
         nvif_ioctl(parent, "create disp base channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
                 nvif_ioctl(parent, "create disp base channel dma vers %d "
-                                   "pushbuf %08x head %d\n",
+                                   "pushbuf %016llx head %d\n",
                            args->v0.version, args->v0.pushbuf, args->v0.head);
                 if (args->v0.head > disp->head.nr)
                         return -EINVAL;
@@ -772,7 +775,7 @@ nv50_disp_ovly_ctor(struct nvkm_object *parent,
         nvif_ioctl(parent, "create disp overlay channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
                 nvif_ioctl(parent, "create disp overlay channel dma vers %d "
-                                   "pushbuf %08x head %d\n",
+                                   "pushbuf %016llx head %d\n",
                            args->v0.version, args->v0.pushbuf, args->v0.head);
                 if (args->v0.head > disp->head.nr)
                         return -EINVAL;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index 0d495d274eb3..21dbd3901113 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -113,7 +113,6 @@ extern const struct nvkm_event_func gf110_disp_chan_uevent;
 
 struct nv50_disp_dmac {
         struct nv50_disp_chan base;
-        struct nvkm_dmaobj *pushdma;
         u32 push;
 };
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
index e298aef71918..73b8ab4c222e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
@@ -54,9 +54,12 @@ int
 nvkm_fifo_channel_create_(struct nvkm_object *parent,
                           struct nvkm_object *engine,
                           struct nvkm_oclass *oclass,
-                          int bar, u32 addr, u32 size, u32 pushbuf,
+                          int bar, u32 addr, u32 size, u64 pushbuf,
                           u64 engmask, int len, void **ptr)
 {
+        struct nvkm_client *client = nvkm_client(parent);
+        struct nvkm_handle *handle;
+        struct nvkm_dmaobj *dmaobj;
         struct nvkm_fifo *fifo = (void *)engine;
         struct nvkm_fifo_chan *chan;
         struct nvkm_dmaeng *dmaeng;
@@ -73,12 +76,13 @@ nvkm_fifo_channel_create_(struct nvkm_object *parent,
                 return ret;
 
         /* validate dma object representing push buffer */
-        chan->pushdma = (void *)nvkm_handle_ref(parent, pushbuf);
-        if (!chan->pushdma)
+        handle = nvkm_client_search(client, pushbuf);
+        if (!handle)
                 return -ENOENT;
+        dmaobj = (void *)handle->object;
 
-        dmaeng = (void *)chan->pushdma->base.engine;
-        switch (chan->pushdma->base.oclass->handle) {
+        dmaeng = (void *)dmaobj->base.engine;
+        switch (dmaobj->base.oclass->handle) {
         case NV_DMA_FROM_MEMORY:
         case NV_DMA_IN_MEMORY:
                 break;
@@ -86,7 +90,7 @@ nvkm_fifo_channel_create_(struct nvkm_object *parent,
                 return -EINVAL;
         }
 
-        ret = dmaeng->bind(chan->pushdma, parent, &chan->pushgpu);
+        ret = dmaeng->bind(dmaobj, parent, &chan->pushgpu);
         if (ret)
                 return ret;
 
@@ -126,7 +130,6 @@ nvkm_fifo_channel_destroy(struct nvkm_fifo_chan *chan)
         spin_unlock_irqrestore(&fifo->lock, flags);
 
         nvkm_gpuobj_ref(NULL, &chan->pushgpu);
-        nvkm_object_ref(NULL, (struct nvkm_object **)&chan->pushdma);
         nvkm_namedb_destroy(&chan->namedb);
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
index c4f48112aa05..575329d3f2bb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
@@ -182,7 +182,7 @@ g84_fifo_chan_ctor_dma(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
@@ -258,7 +258,7 @@ g84_fifo_chan_ctor_ind(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %llx "
                                    "ioffset %016llx ilength %08x\n",
                            args->v0.version, args->v0.pushbuf, args->v0.ioffset,
                            args->v0.ilength);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
index d940d41d1182..cfaa8aeb2223 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
@@ -210,7 +210,7 @@ gf100_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %llx "
                                    "ioffset %016llx ilength %08x\n",
                            args->v0.version, args->v0.pushbuf, args->v0.ioffset,
                            args->v0.ilength);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index 9a1ecef24813..9c423514fee7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -251,7 +251,7 @@ gk104_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %llx "
                                    "ioffset %016llx ilength %08x engine %08x\n",
                            args->v0.version, args->v0.pushbuf, args->v0.ioffset,
                            args->v0.ilength, args->v0.engine);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
index d5346636b7e3..6458fa0dcb95 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
@@ -120,7 +120,7 @@ nv04_fifo_chan_ctor(struct nvkm_object *parent,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
index 5a7b11f92684..c4b5a3002e3c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
@@ -64,7 +64,7 @@ nv10_fifo_chan_ctor(struct nvkm_object *parent,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
index 537bb7229e3d..ece2715e77ff 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
@@ -69,7 +69,7 @@ nv17_fifo_chan_ctor(struct nvkm_object *parent,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
index 27f07d1db85f..a42218a961d4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
@@ -192,7 +192,7 @@ nv40_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
index 24154778c01e..1a7ca8e5aecb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
@@ -212,7 +212,7 @@ nv50_fifo_chan_ctor_dma(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel dma size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                    "offset %016llx\n", args->v0.version,
                            args->v0.pushbuf, args->v0.offset);
         } else
@@ -276,7 +276,7 @@ nv50_fifo_chan_ctor_ind(struct nvkm_object *parent, struct nvkm_object *engine,
 
         nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
         if (nvif_unpack(args->v0, 0, 0, false)) {
-                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                nvif_ioctl(parent, "create channel gpfifo vers %d pushbuf %llx "
                                    "ioffset %016llx ilength %08x\n",
                            args->v0.version, args->v0.pushbuf, args->v0.ioffset,
                            args->v0.ilength);