Commit c358f538 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: add new channel lookup interfaces 



- supports per-runlist CHIDs
- channel group lock held across reference, rather than global lock

v2:
- remove unnecessary parenthesis

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

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct nvkm_falcon_func { 
		u32  size;

	} data;

	void (*init)(struct nvkm_falcon *);

	void (*intr)(struct nvkm_falcon *, struct nvkm_fifo_chan *);

	void (*intr)(struct nvkm_falcon *, struct nvkm_chan *);



	u32 debug;

	u32 fbif;

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

+4 −7
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ struct nvkm_chan { 
	struct nvkm_fifo_engn engn[NVKM_FIFO_ENGN_NR];

};



struct nvkm_chan *nvkm_chan_get_chid(struct nvkm_engine *, int id, unsigned long *irqflags);

struct nvkm_chan *nvkm_chan_get_inst(struct nvkm_engine *, u64 inst, unsigned long *irqflags);

void nvkm_chan_put(struct nvkm_chan **, unsigned long irqflags);



struct nvkm_fifo {

	const struct nvkm_fifo_func *func;

	struct nvkm_engine engine;
@@ -62,13 +66,6 @@ void nvkm_fifo_fault(struct nvkm_fifo *, struct nvkm_fault_data *); 
void nvkm_fifo_pause(struct nvkm_fifo *, unsigned long *);

void nvkm_fifo_start(struct nvkm_fifo *, unsigned long *);



void nvkm_fifo_chan_put(struct nvkm_fifo *, unsigned long flags,

			struct nvkm_fifo_chan **);

struct nvkm_fifo_chan *

nvkm_fifo_chan_inst(struct nvkm_fifo *, u64 inst, unsigned long *flags);

struct nvkm_fifo_chan *

nvkm_fifo_chan_chid(struct nvkm_fifo *, int chid, unsigned long *flags);



int nv04_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv10_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv17_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ gt215_ce_isr_error_name[] = { 
};



void

gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan)

gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_chan *chan)

{

	struct nvkm_subdev *subdev = &ce->engine.subdev;

	struct nvkm_device *device = subdev->device;
@@ -55,9 +55,9 @@ gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan) 


	nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] ch %d [%010llx %s] "

			   "subc %d mthd %04x data %08x\n", ssta,

		   en ? en->name : "", chan ? chan->chid : -1,

		   en ? en->name : "", chan ? chan->id : -1,

		   chan ? chan->inst->addr : 0,

		   chan ? chan->object.client->name : "unknown",

		   chan ? chan->name : "unknown",

		   subc, mthd, data);

}

drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c

+5 −6
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ g84_cipher_intr(struct nvkm_engine *cipher) 
{

	struct nvkm_subdev *subdev = &cipher->subdev;

	struct nvkm_device *device = subdev->device;

	struct nvkm_fifo *fifo = device->fifo;

	struct nvkm_fifo_chan *chan;

	struct nvkm_chan *chan;

	u32 stat = nvkm_rd32(device, 0x102130);

	u32 mthd = nvkm_rd32(device, 0x102190);

	u32 data = nvkm_rd32(device, 0x102194);
@@ -90,16 +89,16 @@ g84_cipher_intr(struct nvkm_engine *cipher) 
	unsigned long flags;

	char msg[128];



	chan = nvkm_fifo_chan_inst(fifo, (u64)inst << 12, &flags);

	chan = nvkm_chan_get_inst(cipher, (u64)inst << 12, &flags);

	if (stat) {

		nvkm_snprintbf(msg, sizeof(msg), g84_cipher_intr_mask, stat);

		nvkm_error(subdev,  "%08x [%s] ch %d [%010llx %s] "

				    "mthd %04x data %08x\n", stat, msg,

			   chan ? chan->chid : -1, (u64)inst << 12,

			   chan ? chan->object.client->name : "unknown",

			   chan ? chan->id : -1, (u64)inst << 12,

			   chan ? chan->name : "unknown",

			   mthd, data);

	}

	nvkm_fifo_chan_put(fifo, flags, &chan);

	nvkm_chan_put(&chan, flags);



	nvkm_wr32(device, 0x102130, stat);

	nvkm_wr32(device, 0x10200c, 0x10);

drivers/gpu/drm/nouveau/nvkm/engine/falcon.c

+3 −3
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ nvkm_falcon_intr(struct nvkm_engine *engine) 
	u32 dest = nvkm_rd32(device, base + 0x01c);

	u32 intr = nvkm_rd32(device, base + 0x008) & dest & ~(dest >> 16);

	u32 inst = nvkm_rd32(device, base + 0x050) & 0x3fffffff;

	struct nvkm_fifo_chan *chan;

	struct nvkm_chan *chan;

	unsigned long flags;



	chan = nvkm_fifo_chan_inst(device->fifo, (u64)inst << 12, &flags);

	chan = nvkm_chan_get_inst(engine, (u64)inst << 12, &flags);



	if (intr & 0x00000040) {

		if (falcon->func->intr) {
@@ -89,7 +89,7 @@ nvkm_falcon_intr(struct nvkm_engine *engine) 
		nvkm_wr32(device, base + 0x004, intr);

	}



	nvkm_fifo_chan_put(device->fifo, flags, &chan);

	nvkm_chan_put(&chan, flags);

}



static int