On Fri, 26 Jul 2024 14:38:27 +1000
Ben Skeggs <bskeggs@xxxxxxxxxx> wrote:
Reviewed-by: Zhi Wang <zhiw@xxxxxxxxxx>
> Left-overs from the past that are completely unused now.
>
> Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
> ---
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ---
> drivers/gpu/drm/nouveau/dispnv50/disp.h | 9 ---------
> 2 files changed, 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> b/drivers/gpu/drm/nouveau/dispnv50/disp.c index
> 242887ab4ba0..22ecda545550 100644 ---
> a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++
> b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -239,8 +239,6 @@
> nv50_dmac_create(struct nouveau_drm *drm, u8 type = NVIF_MEM_COHERENT;
> int ret;
>
> - mutex_init(&dmac->lock);
> -
> /* Pascal added support for 47-bit physical addresses, but
> some
> * parts of EVO still only accept 40-bit PAs.
> *
> @@ -258,7 +256,6 @@ nv50_dmac_create(struct nouveau_drm *drm,
> if (ret)
> return ret;
>
> - dmac->ptr = dmac->_push.mem.object.map.ptr;
> dmac->_push.wait = nv50_dmac_wait;
> dmac->_push.kick = nv50_dmac_kick;
> dmac->push = &dmac->_push;
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h
> b/drivers/gpu/drm/nouveau/dispnv50/disp.h index
> da3add95f354..b66a30915af2 100644 ---
> a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++
> b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -64,16 +64,10 @@ struct
> nv50_dmac {
> struct nvif_push _push;
> struct nvif_push *push;
> - u32 *ptr;
>
> struct nvif_object sync;
> struct nvif_object vram;
>
> - /* Protects against concurrent pushbuf access to this
> channel, lock is
> - * grabbed by evo_wait (if the pushbuf reservation is
> successful) and
> - * dropped again by evo_kick. */
> - struct mutex lock;
> -
> u32 cur;
> u32 put;
> u32 max;
> @@ -108,9 +102,6 @@ void nv50_dmac_destroy(struct nv50_dmac *);
> */
> struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder);
>
> -u32 *evo_wait(struct nv50_dmac *, int nr);
> -void evo_kick(u32 *, struct nv50_dmac *);
> -
> extern const u64 disp50xx_modifiers[];
> extern const u64 disp90xx_modifiers[];
> extern const u64 wndwc57e_modifiers[];
