Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau/fifo/gp100: initial support 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define KEPLER_CHANNEL_GPFIFO_A                       /* cla06f.h */ 0x0000a06f

#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 NV50_DISP                                     /* cl5070.h */ 0x00005070

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

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

+1 −0
Original line number Diff line number Diff line
@@ -66,4 +66,5 @@ int gk20a_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int gm107_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

#endif

drivers/gpu/drm/nouveau/nouveau_chan.c

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ static int 
nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device,

		    u32 engine, struct nouveau_channel **pchan)

{

	static const u16 oclasses[] = { MAXWELL_CHANNEL_GPFIFO_A,

	static const u16 oclasses[] = { PASCAL_CHANNEL_GPFIFO_A,

					MAXWELL_CHANNEL_GPFIFO_A,

					KEPLER_CHANNEL_GPFIFO_B,

					KEPLER_CHANNEL_GPFIFO_A,

					FERMI_CHANNEL_GPFIFO,

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ nouveau_accel_init(struct nouveau_drm *drm) 
		case KEPLER_CHANNEL_GPFIFO_A:

		case KEPLER_CHANNEL_GPFIFO_B:

		case MAXWELL_CHANNEL_GPFIFO_A:

		case PASCAL_CHANNEL_GPFIFO_A:

			ret = nvc0_fence_create(drm);

			break;

		default:

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

+1 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,7 @@ nv130_chipset = { 
	.top = gk104_top_new,

	.dma = gf119_dma_new,

	.disp = gp100_disp_new,

	.fifo = gp100_fifo_new,

};



static int