Commit 9d24907c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/gv100: return work submission token in channel ctor args 



The token will also contain runlist ID on Turing, so instead expose it as
an opaque value from NVKM so the client doesn't need to care.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a98a3c52

drivers/gpu/drm/nouveau/include/nvif/class.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
#define KEPLER_CHANNEL_GPFIFO_B                       /* cla06f.h */ 0x0000a16f

#define MAXWELL_CHANNEL_GPFIFO_A                      /* cla06f.h */ 0x0000b06f

#define PASCAL_CHANNEL_GPFIFO_A                       /* cla06f.h */ 0x0000c06f

#define VOLTA_CHANNEL_GPFIFO_A                        /* cla06f.h */ 0x0000c36f

#define VOLTA_CHANNEL_GPFIFO_A                        /* clc36f.h */ 0x0000c36f



#define NV50_DISP                                     /* cl5070.h */ 0x00005070

#define G82_DISP                                      /* cl5070.h */ 0x00008270

drivers/gpu/drm/nouveau/include/nvif/clc36f.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __NVIF_CLC36F_H__

#define __NVIF_CLC36F_H__



struct volta_channel_gpfifo_a_v0 {

	__u8  version;

	__u8  priv;

	__u16 chid;

	__u32 ilength;

	__u64 ioffset;

	__u64 runlist;

	__u64 vmm;

	__u64 inst;

	__u32 token;

};



#define NVC36F_V0_NTFY_NON_STALL_INTERRUPT                                 0x00

#define NVC36F_V0_NTFY_KILLED                                              0x01

#endif

drivers/gpu/drm/nouveau/nouveau_chan.c

+16 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <nvif/cl506f.h>

#include <nvif/cl906f.h>

#include <nvif/cla06f.h>

#include <nvif/clc36f.h>

#include <nvif/ioctl.h>



/*XXX*/
@@ -234,6 +235,7 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, 
		struct nv50_channel_gpfifo_v0 nv50;

		struct fermi_channel_gpfifo_v0 fermi;

		struct kepler_channel_gpfifo_a_v0 kepler;

		struct volta_channel_gpfifo_a_v0 volta;

	} args;

	struct nouveau_channel *chan;

	u32 size;
@@ -247,6 +249,15 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, 


	/* create channel object */

	do {

		if (oclass[0] >= VOLTA_CHANNEL_GPFIFO_A) {

			args.volta.version = 0;

			args.volta.ilength = 0x02000;

			args.volta.ioffset = 0x10000 + chan->push.addr;

			args.volta.runlist = runlist;

			args.volta.vmm = nvif_handle(&cli->vmm.vmm.object);

			args.volta.priv = priv;

			size = sizeof(args.volta);

		} else

		if (oclass[0] >= KEPLER_CHANNEL_GPFIFO_A) {

			args.kepler.version = 0;

			args.kepler.ilength = 0x02000;
@@ -274,6 +285,11 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, 
		ret = nvif_object_init(&device->object, 0, *oclass++,

				       &args, size, &chan->user);

		if (ret == 0) {

			if (chan->user.oclass >= VOLTA_CHANNEL_GPFIFO_A) {

				chan->chid = args.volta.chid;

				chan->inst = args.volta.inst;

				chan->token = args.volta.token;

			} else

			if (chan->user.oclass >= KEPLER_CHANNEL_GPFIFO_A) {

				chan->chid = args.kepler.chid;

				chan->inst = args.kepler.inst;

drivers/gpu/drm/nouveau/nouveau_chan.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct nouveau_channel { 


	int chid;

	u64 inst;

	u32 token;



	struct nvif_object vram;

	struct nvif_object gart;

drivers/gpu/drm/nouveau/nouveau_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ nv50_dma_push(struct nouveau_channel *chan, u64 offset, int length) 


	nvif_wr32(&chan->user, 0x8c, chan->dma.ib_put);

	if (user->func && user->func->doorbell)

		user->func->doorbell(user, chan->chid);

		user->func->doorbell(user, chan->token);

	chan->dma.ib_free--;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE