- no more users
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
---
drivers/gpu/drm/nouveau/include/nvif/driverif.h | 3 +--
drivers/gpu/drm/nouveau/nouveau_chan.c | 3 +--
drivers/gpu/drm/nouveau/nvkm/device/user.c | 5 +++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index 69428a879c37..b25c91542e66 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -618,8 +618,7 @@ struct nvif_device_impl {
struct nvif_vmm_priv *, struct nvif_ctxdma_priv *push,
u64 offset, u64 length, struct nvif_mem_priv *userd,
u16 userd_offset, const char *name,
- const struct nvif_chan_impl **, struct nvif_chan_priv **,
- u64 handle);
+ const struct nvif_chan_impl **, struct nvif_chan_priv **);
} chan;
} fifo;
};
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 80099dfcd3d5..54816bcca14c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -333,8 +333,7 @@ nouveau_channel_ctor(struct nouveau_cli *cli, bool priv, u64 runm,
ret = device->impl->fifo.chan.new(device->priv, device->impl->fifo.runl[chan->runlist].id,
0, priv, BIT(0), vmm, ctxdma, offset, length,
userd, userd_offset, chan->name,
- &chan->chan.impl, &chan->chan.priv,
- nvif_handle(&chan->chan.object));
+ &chan->chan.impl, &chan->chan.priv);
if (ret) {
nouveau_channel_del(pchan);
return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/device/user.c b/drivers/gpu/drm/nouveau/nvkm/device/user.c
index efa675c8098f..d7b41b990d56 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/user.c
@@ -102,7 +102,7 @@ nvkm_udevice_chan_new(struct nvif_device_priv *udev, u8 runl, u8 runq, bool priv
struct nvif_vmm_priv *uvmm, struct nvif_ctxdma_priv *push,
u64 offset, u64 length, struct nvif_mem_priv *userd, u16 userd_offset,
const char *name, const struct nvif_chan_impl **pimpl,
- struct nvif_chan_priv **ppriv, u64 handle)
+ struct nvif_chan_priv **ppriv)
{
struct nvkm_vmm *vmm = nvkm_uvmm_ref(uvmm);
struct nvkm_object *object;
@@ -115,7 +115,8 @@ nvkm_udevice_chan_new(struct nvif_device_priv *udev, u8 runl, u8 runq, bool priv
if (ret)
return ret;
- return nvkm_object_link_rb(udev->object.client, &udev->object, handle, object);
+ nvkm_object_link(&udev->object, object);
+ return 0;
}
static int
--
2.41.0
