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

Commit 424321be authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gp102: initial support 



Differences from GP100:
- 3 PPCs/GPC.
- Another random reg to calculate/write.
- Attrib CB setup a little different.
- PascalB
- PascalComputeB

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

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

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ 
#define MAXWELL_B                                     /* cl9097.h */ 0x0000b197



#define PASCAL_A                                      /* cl9097.h */ 0x0000c097

#define PASCAL_B                                      /* cl9097.h */ 0x0000c197



#define NV74_BSP                                                     0x000074b0
@@ -163,6 +164,7 @@ 
#define MAXWELL_COMPUTE_A                                            0x0000b0c0

#define MAXWELL_COMPUTE_B                                            0x0000b1c0

#define PASCAL_COMPUTE_A                                             0x0000c0c0

#define PASCAL_COMPUTE_B                                             0x0000c1c0



#define NV74_CIPHER                                                  0x000074c1

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -43,4 +43,5 @@ int gm107_gr_new(struct nvkm_device *, int, struct nvkm_gr **); 
int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ nvkm-y += nvkm/engine/gr/gm107.o 
nvkm-y += nvkm/engine/gr/gm200.o

nvkm-y += nvkm/engine/gr/gm20b.o

nvkm-y += nvkm/engine/gr/gp100.o

nvkm-y += nvkm/engine/gr/gp102.o



nvkm-y += nvkm/engine/gr/ctxnv40.o

nvkm-y += nvkm/engine/gr/ctxnv50.o
@@ -50,3 +51,4 @@ nvkm-y += nvkm/engine/gr/ctxgm107.o 
nvkm-y += nvkm/engine/gr/ctxgm200.o

nvkm-y += nvkm/engine/gr/ctxgm20b.o

nvkm-y += nvkm/engine/gr/ctxgp100.o

nvkm-y += nvkm/engine/gr/ctxgp102.o

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ void gm200_grctx_generate_405b60(struct gf100_gr *); 
extern const struct gf100_grctx_func gm20b_grctx;



extern const struct gf100_grctx_func gp100_grctx;

void gp100_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);

void gp100_grctx_generate_pagepool(struct gf100_grctx *);



extern const struct gf100_grctx_func gp102_grctx;



/* context init value lists */

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * PGRAPH context implementation

 ******************************************************************************/



static void

void

gp100_grctx_generate_pagepool(struct gf100_grctx *info)

{

	const struct gf100_grctx_func *grctx = info->gr->func->grctx;
@@ -123,7 +123,7 @@ gp100_grctx_generate_405b60(struct gf100_gr *gr) 
		nvkm_wr32(device, 0x405ba0 + (i * 4), gpcs[i]);

}



static void

void

gp100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)

{

	struct nvkm_device *device = gr->base.engine.subdev.device;