Commit 933ad445 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: remove hardcoded idle_timeout values 



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

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

+3 −2
Original line number Diff line number Diff line
@@ -1238,6 +1238,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
{

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

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;



	nvkm_mc_unk260(device->mc, 0);
@@ -1247,7 +1248,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



	nvkm_wr32(device, 0x404154, 0x00000000);

	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);



	grctx->bundle(info);

	grctx->pagepool(info);
@@ -1261,7 +1262,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_grctx_generate_r406800(gr);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, 0x00000400);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device->mc, 1);

}

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

+3 −2
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
{

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

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;

	int i;



	nvkm_mc_unk260(device->mc, 0);
@@ -233,7 +234,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



	nvkm_wr32(device, 0x404154, 0x00000000);

	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);



	grctx->bundle(info);

	grctx->pagepool(info);
@@ -250,7 +251,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
		nvkm_wr32(device, 0x4064d0 + (i * 0x04), 0x00000000);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, 0x00000400);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device->mc, 1);

}

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

+3 −2
Original line number Diff line number Diff line
@@ -956,6 +956,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
{

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

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;

	int i;



	nvkm_mc_unk260(device->mc, 0);
@@ -966,7 +967,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



	nvkm_wr32(device, 0x404154, 0x00000000);

	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);



	grctx->bundle(info);

	grctx->pagepool(info);
@@ -986,7 +987,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, 0x00000400);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device->mc, 1);

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

+3 −4
Original line number Diff line number Diff line
@@ -29,15 +29,14 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
{

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

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	int idle_timeout_save;

	u32 idle_timeout;

	int i;



	gf100_gr_mmio(gr, gr->fuc_sw_ctx);



	gf100_gr_wait_idle(gr);



	idle_timeout_save = nvkm_rd32(device, 0x404154);

	nvkm_wr32(device, 0x404154, 0x00000000);

	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);



	grctx->attrib(info);
@@ -59,7 +58,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 


	gf100_gr_wait_idle(gr);



	nvkm_wr32(device, 0x404154, idle_timeout_save);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_wait_idle(gr);



	gf100_gr_mthd(gr, gr->fuc_method);

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

+3 −2
Original line number Diff line number Diff line
@@ -957,6 +957,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
{

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

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;

	int i;



	gf100_gr_mmio(gr, grctx->hub);
@@ -965,7 +966,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



	nvkm_wr32(device, 0x404154, 0x00000000);

	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);



	grctx->bundle(info);

	grctx->pagepool(info);
@@ -987,7 +988,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gk104_grctx_generate_rop_active_fbps(gr);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, 0x00000400);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);



	nvkm_mask(device, 0x419e00, 0x00808080, 0x00808080);