Commit da1fbcc0 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/fifo/tu102-: prepare for GSP-RM 



- (temporarily) disable if GSP-RM detected, will be added later
- add dtor() so GSP-RM paths can cleanup properly
- add alternate engine context mapping interface for RM engines
- add alternate chid interfaces to handle RM USERD oddities

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-26-skeggsb@gmail.com
parent 8c186c83

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ struct nvkm_fifo { 
	struct {

		struct nvkm_memory *mem;

		struct nvkm_vma *bar1;



		struct mutex mutex;

		struct list_head list;

	} userd;



	spinlock_t lock;

drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c

+9 −0
Original line number Diff line number Diff line
@@ -347,8 +347,14 @@ nvkm_fifo_dtor(struct nvkm_engine *engine) 
	nvkm_chid_unref(&fifo->cgid);

	nvkm_chid_unref(&fifo->chid);



	mutex_destroy(&fifo->userd.mutex);



	nvkm_event_fini(&fifo->nonstall.event);

	mutex_destroy(&fifo->mutex);



	if (fifo->func->dtor)

		fifo->func->dtor(fifo);



	return fifo;

}
@@ -383,5 +389,8 @@ nvkm_fifo_new_(const struct nvkm_fifo_func *func, struct nvkm_device *device, 
	spin_lock_init(&fifo->lock);

	mutex_init(&fifo->mutex);



	INIT_LIST_HEAD(&fifo->userd.list);

	mutex_init(&fifo->userd.mutex);



	return nvkm_engine_ctor(&nvkm_fifo, device, type, inst, true, &fifo->engine);

}

drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ nvkm_cgrp_vctx_get(struct nvkm_cgrp *cgrp, struct nvkm_engn *engn, struct nvkm_c 
		atomic_inc(&vctx->vmm->engref[engn->engine->subdev.type]);



	/* Allocate the HW structures. */

	if (engn->func->ctor2) {

		ret = engn->func->ctor2(engn, vctx, chan);

	} else

	if (engn->func->bind) {

		ret = nvkm_object_bind(vctx->ectx->object, NULL, 0, &vctx->inst);

		if (ret == 0 && engn->func->ctor)

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c

+33 −22
Original line number Diff line number Diff line
@@ -275,13 +275,17 @@ nvkm_chan_del(struct nvkm_chan **pchan) 
	nvkm_gpuobj_del(&chan->cache);

	nvkm_gpuobj_del(&chan->ramfc);



	nvkm_memory_unref(&chan->userd.mem);



	if (chan->cgrp) {

		if (!chan->func->id_put)

			nvkm_chid_put(chan->cgrp->runl->chid, chan->id, &chan->cgrp->lock);

		else

			chan->func->id_put(chan);



		nvkm_cgrp_unref(&chan->cgrp);

	}



	nvkm_memory_unref(&chan->userd.mem);



	if (chan->vmm) {

		nvkm_vmm_part(chan->vmm, chan->inst->memory);

		nvkm_vmm_unref(&chan->vmm);
@@ -438,18 +442,12 @@ nvkm_chan_new_(const struct nvkm_chan_func *func, struct nvkm_runl *runl, int ru 
	}



	/* Allocate channel ID. */

	if (!chan->func->id_get) {

		chan->id = nvkm_chid_get(runl->chid, chan);

	if (chan->id < 0) {

		RUNL_ERROR(runl, "!chids");

		return -ENOSPC;

	}



	if (cgrp->id < 0)

		cgrp->id = chan->id;



	/* Initialise USERD. */

		if (chan->id >= 0) {

			if (func->userd->bar < 0) {

		if (ouserd + chan->func->userd->size >= nvkm_memory_size(userd)) {

				if (ouserd + chan->func->userd->size >=

					nvkm_memory_size(userd)) {

					RUNL_DEBUG(runl, "ouserd %llx", ouserd);

					return -EINVAL;

				}
@@ -465,7 +463,20 @@ nvkm_chan_new_(const struct nvkm_chan_func *func, struct nvkm_runl *runl, int ru 
				chan->userd.mem = nvkm_memory_ref(fifo->userd.mem);

				chan->userd.base = chan->id * chan->func->userd->size;

			}

		}

	} else {

		chan->id = chan->func->id_get(chan, userd, ouserd);

	}



	if (chan->id < 0) {

		RUNL_ERROR(runl, "!chids");

		return -ENOSPC;

	}



	if (cgrp->id < 0)

		cgrp->id = chan->id;



	/* Initialise USERD. */

	if (chan->func->userd->clear)

		chan->func->userd->clear(chan);

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ struct nvkm_cctx { 
};



struct nvkm_chan_func {

	int (*id_get)(struct nvkm_chan *, struct nvkm_memory *userd, u64 ouserd);

	void (*id_put)(struct nvkm_chan *);



	const struct nvkm_chan_func_inst {

		u32 size;

		bool zero;