drm/nouveau/kms: remove a few unused struct members and fn decls

Left-overs from the past that are completely unused now.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-37-bskeggs@nvidia.com

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 242887ab4ba0db095d4e1a3782cf499b1559df70..22ecda545550c849eead36526c73ee4f86d5714e 100644 (file)
--- 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 da3add95f354717309c0269859ff8039e3ec483c..b66a30915af26392e34e55093ab1ed26f286c65e 100644 (file)
--- 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[];