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

Commit a032fb9d authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/gr: add GM20B support 



Add support for GM20B's graphics engine, based on GK20A. Note that this
code alone will not allow the engine to initialize on released devices
which require PMU-assisted secure boot.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3326060a

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

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ extern struct nvkm_oclass *gk208_gr_oclass; 
extern struct nvkm_oclass *gm107_gr_oclass;

extern struct nvkm_oclass *gm204_gr_oclass;

extern struct nvkm_oclass *gm206_gr_oclass;

extern struct nvkm_oclass *gm20b_gr_oclass;



#include <core/enum.h>

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

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ nvkm-y += nvkm/engine/gr/ctxgk208.o 
nvkm-y += nvkm/engine/gr/ctxgm107.o

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

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

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

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

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

nvkm-y += nvkm/engine/gr/nv20.o
@@ -38,3 +39,4 @@ nvkm-y += nvkm/engine/gr/gk208.o 
nvkm-y += nvkm/engine/gr/gm107.o

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

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

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

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

+7 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ void gk104_grctx_generate_r418bb8(struct gf100_gr_priv *); 
void gk104_grctx_generate_rop_active_fbps(struct gf100_gr_priv *);





void gm107_grctx_generate_bundle(struct gf100_grctx *);

void gm107_grctx_generate_pagepool(struct gf100_grctx *);

void gm107_grctx_generate_attrib(struct gf100_grctx *);



extern struct nvkm_oclass *gk110_grctx_oclass;

extern struct nvkm_oclass *gk110b_grctx_oclass;

extern struct nvkm_oclass *gk208_grctx_oclass;
@@ -102,8 +106,11 @@ void gm107_grctx_generate_attrib(struct gf100_grctx *); 


extern struct nvkm_oclass *gm204_grctx_oclass;

void gm204_grctx_generate_main(struct gf100_gr_priv *, struct gf100_grctx *);

void gm204_grctx_generate_tpcid(struct gf100_gr_priv *);

void gm204_grctx_generate_405b60(struct gf100_gr_priv *);



extern struct nvkm_oclass *gm206_grctx_oclass;

extern struct nvkm_oclass *gm20b_grctx_oclass;



/* context init value lists */

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

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ gm107_grctx_generate_attrib(struct gf100_grctx *info) 
	}

}



static void

void

gm107_grctx_generate_tpcid(struct gf100_gr_priv *priv)

{

	int gpc, tpc, id;

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

+2 −2
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ gm204_grctx_pack_ppc[] = { 
 * PGRAPH context implementation

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



static void

void

gm204_grctx_generate_tpcid(struct gf100_gr_priv *priv)

{

	int gpc, tpc, id;
@@ -943,7 +943,7 @@ gm204_grctx_generate_rop_active_fbps(struct gf100_gr_priv *priv) 
	nv_mask(priv, 0x408958, 0x0000000f, fbp_count); /* crop */

}



static void

void

gm204_grctx_generate_405b60(struct gf100_gr_priv *priv)

{

	const u32 dist_nr = DIV_ROUND_UP(priv->tpc_total, 4);