Commit 58c3d3c8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/vfn: move NV_USERMODE class from host 



- uses proper class IDs for Turing/Ampere

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

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

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#define NV04_DISP                                     /* cl0046.h */ 0x00000046



#define VOLTA_USERMODE_A                                             0x0000c361

#define TURING_USERMODE_A                                            0x0000c461

#define AMPERE_USERMODE_A                                            0x0000c561



#define MAXWELL_FAULT_BUFFER_A                        /* clb069.h */ 0x0000b069

#define VOLTA_FAULT_BUFFER_A                          /* clb069.h */ 0x0000c369

drivers/gpu/drm/nouveau/include/nvkm/subdev/vfn.h

+3 −0
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ struct nvkm_vfn { 


	struct {

		u32 priv;

		u32 user;

	} addr;



	struct nvkm_device_oclass user;

};



int gv100_vfn_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_vfn **);

drivers/gpu/drm/nouveau/nvif/user.c

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ nvif_user_ctor(struct nvif_device *device, const char *name) 
		int version;

		const struct nvif_user_func *func;

	} users[] = {

		{ AMPERE_USERMODE_A, -1, &nvif_userc361 },

		{ TURING_USERMODE_A, -1, &nvif_userc361 },

		{  VOLTA_USERMODE_A, -1, &nvif_userc361 },

		{}

	};

drivers/gpu/drm/nouveau/nvkm/engine/device/user.c

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ nvkm_udevice_child_get(struct nvkm_object *object, int index, 
			sclass = &device->mmu->user;

		else if (device->fault && index-- == 0)

			sclass = &device->fault->user;

		else if (device->vfn && index-- == 0)

			sclass = &device->vfn->user;

		else

			return -EINVAL;

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

+0 −3
Original line number Diff line number Diff line
@@ -35,6 +35,3 @@ nvkm-y += nvkm/engine/fifo/gpfifogf100.o 
nvkm-y += nvkm/engine/fifo/gpfifogk104.o

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

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


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

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