- no more users
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
---
drivers/gpu/drm/nouveau/include/nvif/driverif.h | 2 +-
drivers/gpu/drm/nouveau/nvif/outp.c | 3 +--
drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c | 6 +++---
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 f7c7a98089b3..57ad5022a534 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -366,7 +366,7 @@ struct nvif_disp_impl {
struct {
u32 mask;
int (*new)(struct nvif_disp_priv *, u8 id,
- const struct nvif_outp_impl **, struct nvif_outp_priv **, u64 handle);
+ const struct nvif_outp_impl **, struct nvif_outp_priv **);
} outp;
struct {
diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c
index f04154e7a7b4..65c4b8539b55 100644
--- a/drivers/gpu/drm/nouveau/nvif/outp.c
+++ b/drivers/gpu/drm/nouveau/nvif/outp.c
@@ -381,8 +381,7 @@ nvif_outp_ctor(struct nvif_disp *disp, const char *name, int id, struct nvif_out
{
int ret;
- ret = disp->impl->outp.new(disp->priv, id, &outp->impl, &outp->priv,
- nvif_handle(&outp->object));
+ ret = disp->impl->outp.new(disp->priv, id, &outp->impl, &outp->priv);
NVIF_ERRON(ret, &disp->object, "[NEW outp id:%d]", id);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
index 678121ab469f..0be6b28c79b8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
@@ -86,8 +86,7 @@ nvkm_udisp_sclass(struct nvkm_object *object, int index, struct nvkm_oclass *scl
static int
nvkm_udisp_outp_new(struct nvif_disp_priv *udisp, u8 id,
- const struct nvif_outp_impl **pimpl, struct nvif_outp_priv **ppriv,
- u64 handle)
+ const struct nvif_outp_impl **pimpl, struct nvif_outp_priv **ppriv)
{
struct nvkm_object *object;
int ret;
@@ -96,7 +95,8 @@ nvkm_udisp_outp_new(struct nvif_disp_priv *udisp, u8 id,
if (ret)
return ret;
- return nvkm_object_link_rb(udisp->object.client, &udisp->object, handle, object);
+ nvkm_object_link(&udisp->object, object);
+ return 0;
}
static int
--
2.41.0
