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

Commit 734a0aa6 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gm200-: rop count == ltc count 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ int gk104_gr_init(struct gf100_gr *); 
int gk20a_gr_init(struct gf100_gr *);



int gm200_gr_init(struct gf100_gr *);

int gm200_gr_rops(struct gf100_gr *);



#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)

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

+7 −1
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
 * PGRAPH engine/subdev functions

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



int

gm200_gr_rops(struct gf100_gr *gr)

{

	return nvkm_rd32(gr->base.engine.subdev.device, 0x12006c);

}



static void

gm200_gr_init_gpc_mmu(struct gf100_gr *gr)

{
@@ -197,7 +203,7 @@ static const struct gf100_gr_func 
gm200_gr = {

	.init = gm200_gr_init,

	.init_gpc_mmu = gm200_gr_init_gpc_mmu,

	.rops = gf100_gr_rops,

	.rops = gm200_gr_rops,

	.ppc_nr = 2,

	.grctx = &gm200_grctx,

	.sclass = {

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ gm20b_gr = { 
	.init = gk20a_gr_init,

	.init_gpc_mmu = gm20b_gr_init_gpc_mmu,

	.set_hww_esr_report_mask = gm20b_gr_set_hww_esr_report_mask,

	.rops = gf100_gr_rops,

	.rops = gm200_gr_rops,

	.ppc_nr = 1,

	.grctx = &gm20b_grctx,

	.sclass = {