Skip to content

Commit 723388b

Browse files
Ben SkeggsDanilo Krummrich
authored andcommitted
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 <[email protected]> Signed-off-by: Danilo Krummrich <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0df26c0 commit 723388b

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

drivers/gpu/drm/nouveau/dispnv50/disp.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ nv50_dmac_create(struct nouveau_drm *drm,
239239
u8 type = NVIF_MEM_COHERENT;
240240
int ret;
241241

242-
mutex_init(&dmac->lock);
243-
244242
/* Pascal added support for 47-bit physical addresses, but some
245243
* parts of EVO still only accept 40-bit PAs.
246244
*
@@ -258,7 +256,6 @@ nv50_dmac_create(struct nouveau_drm *drm,
258256
if (ret)
259257
return ret;
260258

261-
dmac->ptr = dmac->_push.mem.object.map.ptr;
262259
dmac->_push.wait = nv50_dmac_wait;
263260
dmac->_push.kick = nv50_dmac_kick;
264261
dmac->push = &dmac->_push;

drivers/gpu/drm/nouveau/dispnv50/disp.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,10 @@ struct nv50_dmac {
6464

6565
struct nvif_push _push;
6666
struct nvif_push *push;
67-
u32 *ptr;
6867

6968
struct nvif_object sync;
7069
struct nvif_object vram;
7170

72-
/* Protects against concurrent pushbuf access to this channel, lock is
73-
* grabbed by evo_wait (if the pushbuf reservation is successful) and
74-
* dropped again by evo_kick. */
75-
struct mutex lock;
76-
7771
u32 cur;
7872
u32 put;
7973
u32 max;
@@ -108,9 +102,6 @@ void nv50_dmac_destroy(struct nv50_dmac *);
108102
*/
109103
struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder);
110104

111-
u32 *evo_wait(struct nv50_dmac *, int nr);
112-
void evo_kick(u32 *, struct nv50_dmac *);
113-
114105
extern const u64 disp50xx_modifiers[];
115106
extern const u64 disp90xx_modifiers[];
116107
extern const u64 wndwc57e_modifiers[];

0 commit comments

Comments
 (0)