Commit 800ac1f8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: add chid allocator 



We need to be able to allocate TSG IDs as well as channel IDs, also,
Ampere has per-runlist channel IDs.

- holds per-ID private data, which will be used for/to protect lookup
- holds an nvkm_event which will be used for events tied to IDs
- not used yet beyond setup, and switching use of "fifo->nr - 1" for
  channel ID mask to "chid->mask"

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 9be9c606

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ struct nvkm_fifo { 
	const struct nvkm_fifo_func *func;

	struct nvkm_engine engine;



	struct nvkm_chid *chid;

	struct nvkm_chid *cgid;



	DECLARE_BITMAP(mask, NVKM_FIFO_CHID_NR);

	int nr;

	struct list_head chan;

drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

nvkm-y += nvkm/engine/fifo/base.o

nvkm-y += nvkm/engine/fifo/chan.o

nvkm-y += nvkm/engine/fifo/chid.o



nvkm-y += nvkm/engine/fifo/nv04.o

nvkm-y += nvkm/engine/fifo/nv10.o

nvkm-y += nvkm/engine/fifo/nv17.o
@@ -18,7 +21,6 @@ nvkm-y += nvkm/engine/fifo/gv100.o 
nvkm-y += nvkm/engine/fifo/tu102.o

nvkm-y += nvkm/engine/fifo/ga102.o



nvkm-y += nvkm/engine/fifo/chan.o

nvkm-y += nvkm/engine/fifo/channv50.o

nvkm-y += nvkm/engine/fifo/chang84.o

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

+18 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include "priv.h"

#include "chan.h"

#include "chid.h"



#include <core/gpuobj.h>

#include <subdev/mc.h>
@@ -218,13 +219,15 @@ static int 
nvkm_fifo_info(struct nvkm_engine *engine, u64 mthd, u64 *data)

{

	struct nvkm_fifo *fifo = nvkm_fifo(engine);



	switch (mthd) {

	case NV_DEVICE_HOST_CHANNELS: *data = fifo->nr; return 0;

	case NV_DEVICE_HOST_CHANNELS: *data = fifo->chid ? fifo->chid->nr : 0; return 0;

	default:

		if (fifo->func->info)

			return fifo->func->info(fifo, mthd, data);

		break;

	}



	return -ENOSYS;

}
@@ -232,8 +235,18 @@ static int 
nvkm_fifo_oneinit(struct nvkm_engine *engine)

{

	struct nvkm_fifo *fifo = nvkm_fifo(engine);

	int ret;



	/* Initialise CHID/CGID allocator(s) on GPUs where they aren't per-runlist. */

	if (fifo->func->chid_nr) {

		ret = fifo->func->chid_ctor(fifo, fifo->func->chid_nr(fifo));

		if (ret)

			return ret;

	}



	if (fifo->func->oneinit)

		return fifo->func->oneinit(fifo);



	return 0;

}
@@ -248,6 +261,10 @@ nvkm_fifo_dtor(struct nvkm_engine *engine) 
{

	struct nvkm_fifo *fifo = nvkm_fifo(engine);

	void *data = fifo;



	nvkm_chid_unref(&fifo->cgid);

	nvkm_chid_unref(&fifo->chid);



	if (fifo->func->dtor)

		data = fifo->func->dtor(fifo);

	nvkm_event_fini(&fifo->kevent);
@@ -289,7 +306,6 @@ nvkm_fifo_ctor(const struct nvkm_fifo_func *func, struct nvkm_device *device, 
		fifo->nr = NVKM_FIFO_CHID_NR;

	else

		fifo->nr = nr;

	bitmap_clear(fifo->mask, 0, fifo->nr);



	if (func->uevent_init) {

		ret = nvkm_event_init(&nvkm_fifo_uevent_func, &fifo->engine.subdev, 1, 1,

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

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ 


#include <nvif/if0020.h>



const struct nvkm_event_func

nvkm_chan_event = {

};



struct nvkm_fifo_chan_object {

	struct nvkm_oproxy oproxy;

	struct nvkm_fifo_chan *chan;

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

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#define nvkm_chan(p) container_of((p), struct nvkm_chan, object) /*FIXME: remove later */

#include <engine/fifo.h>



extern const struct nvkm_event_func nvkm_chan_event;



struct nvkm_chan_func {

	void *(*dtor)(struct nvkm_fifo_chan *);

	void (*init)(struct nvkm_fifo_chan *);