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

Commit 7d155dac authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gk208-/gr: stop touching 0x260 inappropriately 



As a side note.. It's a bit hard to figure out how to name this commit..
GK20A is NVEA, which is before NV108 (GK208).. Confusing.

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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ nouveau-y += core/subdev/mc/nv94.o 
nouveau-y += core/subdev/mc/nv98.o

nouveau-y += core/subdev/mc/nvc0.o

nouveau-y += core/subdev/mc/nvc3.o

nouveau-y += core/subdev/mc/gk20a.o

nouveau-y += core/subdev/mxm/base.o

nouveau-y += core/subdev/mxm/mxms.o

nouveau-y += core/subdev/mxm/nv50.o

drivers/gpu/drm/nouveau/core/engine/device/gm100.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ gm100_identify(struct nouveau_device *device) 
#endif

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gm107_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ nve0_identify(struct nouveau_device *device) 
		break;

	case 0xea:

		device->cname = "GK20A";

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk20a_fb_oclass;
@@ -248,7 +248,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c

+2 −2
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ nvc0_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) 
{

	struct nvc0_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass;



	nv_mask(priv, 0x000260, 0x00000001, 0x00000000);

	nouveau_mc(priv)->unk260(nouveau_mc(priv), 0);



	nvc0_graph_mmio(priv, oclass->hub);

	nvc0_graph_mmio(priv, oclass->gpc);
@@ -1192,7 +1192,7 @@ nvc0_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) 
	nvc0_graph_icmd(priv, oclass->icmd);

	nv_wr32(priv, 0x404154, 0x00000400);

	nvc0_graph_mthd(priv, oclass->mthd);

	nv_mask(priv, 0x000260, 0x00000001, 0x00000001);

	nouveau_mc(priv)->unk260(nouveau_mc(priv), 1);

}



int

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) 
	struct nvc0_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass;

	int i;



	nv_mask(priv, 0x000260, 0x00000001, 0x00000000);

	nouveau_mc(priv)->unk260(nouveau_mc(priv), 0);



	nvc0_graph_mmio(priv, oclass->hub);

	nvc0_graph_mmio(priv, oclass->gpc);
@@ -248,7 +248,7 @@ nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) 
	nvc0_graph_icmd(priv, oclass->icmd);

	nv_wr32(priv, 0x404154, 0x00000400);

	nvc0_graph_mthd(priv, oclass->mthd);

	nv_mask(priv, 0x000260, 0x00000001, 0x00000001);

	nouveau_mc(priv)->unk260(nouveau_mc(priv), 1);

}



struct nouveau_oclass *