- no more users
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
---
drivers/gpu/drm/nouveau/dispnv50/base507c.c | 3 +-
drivers/gpu/drm/nouveau/dispnv50/core507d.c | 3 +-
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 3 +-
drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 3 +-
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 3 +-
.../gpu/drm/nouveau/include/nvif/driverif.h | 4 +--
.../gpu/drm/nouveau/nvkm/engine/disp/udisp.c | 35 +++++++------------
7 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
index 875c013c39b0..1cf80535fcfa 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@ -318,8 +318,7 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format,
goto done;
ret = disp->impl->chan.base.new(disp->priv, head, wndw->wndw.push.mem.priv,
- &wndw->wndw.impl, &wndw->wndw.priv,
- nvif_handle(&wndw->wndw.object));
+ &wndw->wndw.impl, &wndw->wndw.priv);
if (ret)
goto done;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
index 4127bc05ea80..dae2b9e68ca7 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
@@ -169,8 +169,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm,
goto done;
ret = disp->impl->chan.core.new(disp->priv, core->chan.push.mem.priv,
- &core->chan.impl, &core->chan.priv,
- nvif_handle(&core->chan.object));
+ &core->chan.impl, &core->chan.priv);
if (ret)
goto done;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index 458c6f9e63f0..ab011c38b8fb 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -160,8 +160,7 @@ ovly507e_new_(const struct nv50_wndw_func *func, const u32 *format,
goto done;
ret = disp->impl->chan.ovly.new(disp->priv, wndw->id, wndw->wndw.push.mem.priv,
- &wndw->wndw.impl, &wndw->wndw.priv,
- nvif_handle(&wndw->wndw.object));
+ &wndw->wndw.impl, &wndw->wndw.priv);
if (ret)
goto done;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
index 2f4f0ad89b5e..34324b20ee0e 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
@@ -75,8 +75,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm,
goto done;
ret = disp->impl->chan.wimm.new(disp->priv, wndw->id, wndw->wimm.push.mem.priv,
- &wndw->wimm.impl, &wndw->wimm.priv,
- nvif_handle(&wndw->wimm.object));
+ &wndw->wimm.impl, &wndw->wimm.priv);
if (ret)
goto done;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index 17751110edae..c44ea1574863 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -364,8 +364,7 @@ wndwc37e_new_(const struct nv50_wndw_func *func, struct nouveau_drm *drm,
goto done;
ret = disp->impl->chan.wndw.new(disp->priv, wndw->id, wndw->wndw.push.mem.priv,
- &wndw->wndw.impl, &wndw->wndw.priv,
- nvif_handle(&wndw->wndw.object));
+ &wndw->wndw.impl, &wndw->wndw.priv);
if (ret)
goto done;
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index 8ae50be82a02..6161a29fb07f 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -411,14 +411,14 @@ struct nvif_disp_impl {
s32 oclass;
int (*new)(struct nvif_disp_priv *, struct nvif_mem_priv *,
const struct nvif_disp_chan_impl **,
- struct nvif_disp_chan_priv **, u64 handle);
+ struct nvif_disp_chan_priv **);
} core;
struct nvif_disp_impl_dmac {
s32 oclass;
int (*new)(struct nvif_disp_priv *, u8 id, struct nvif_mem_priv *,
const struct nvif_disp_chan_impl **,
- struct nvif_disp_chan_priv **, u64 handle);
+ struct nvif_disp_chan_priv **);
} base, ovly, wndw, wimm;
struct nvif_disp_impl_pioc {
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
index bc15fe149a86..321b5b12515c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
@@ -30,8 +30,7 @@
static int
nvkm_udisp_chan_new(struct nvif_disp_priv *udisp, const struct nvkm_disp_func_chan *func,
u8 nr, u8 id, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_memory *memory = NULL;
struct nvkm_object *object;
@@ -48,9 +47,6 @@ nvkm_udisp_chan_new(struct nvif_disp_priv *udisp, const struct nvkm_disp_func_ch
if (ret)
return ret;
- if (handle)
- return nvkm_object_link_rb(udisp->object.client, &udisp->object, handle, object);
-
nvkm_object_link(&udisp->object, object);
return 0;
}
@@ -62,7 +58,7 @@ nvkm_udisp_oimm_new(struct nvif_disp_priv *udisp, u8 id,
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.oimm, disp->head.nr, id, NULL,
- pimpl, ppriv, 0);
+ pimpl, ppriv);
}
static int
@@ -72,61 +68,56 @@ nvkm_udisp_curs_new(struct nvif_disp_priv *udisp, u8 id,
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.curs, disp->head.nr, id, NULL,
- pimpl, ppriv, 0);
+ pimpl, ppriv);
}
static int
nvkm_udisp_wimm_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.wimm, disp->wndw.nr, id, umem,
- pimpl, ppriv, 0);
+ pimpl, ppriv);
}
static int
nvkm_udisp_wndw_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.wndw, disp->wndw.nr, id, umem,
- pimpl, ppriv, handle);
+ pimpl, ppriv);
}
static int
nvkm_udisp_ovly_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.ovly, disp->head.nr, id, umem,
- pimpl, ppriv, handle);
+ pimpl, ppriv);
}
static int
nvkm_udisp_base_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_disp *disp = udisp->disp;
return nvkm_udisp_chan_new(udisp, &disp->func->user.base, disp->head.nr, id, umem,
- pimpl, ppriv, handle);
+ pimpl, ppriv);
}
static int
nvkm_udisp_core_new(struct nvif_disp_priv *udisp, struct nvif_mem_priv *umem,
- const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv,
- u64 handle)
+ const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv)
{
struct nvkm_disp *disp = udisp->disp;
- return nvkm_udisp_chan_new(udisp, &disp->func->user.core, 1, 0, umem, pimpl, ppriv, handle);
+ return nvkm_udisp_chan_new(udisp, &disp->func->user.core, 1, 0, umem, pimpl, ppriv);
}
static int
--
2.41.0
