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

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

drm/nouveau/ltc/gf100: use more reasonable timeout value 



LTC operations timeout was set to 2ms, which may be too low for devices
that run at very low clocks (e.g. GM20B) and trigger timeout messages.

Set the timeout to the default 2s. Also remove the redundant error
messages since nvkm_wait_msec() will already display a warning.

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

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c

+2 −6
Original line number Diff line number Diff line
@@ -129,9 +129,7 @@ gf100_ltc_invalidate(struct nvkm_ltc *ltc) 
	s64 taken;



	nvkm_wr32(device, 0x70004, 0x00000001);

	taken = nvkm_wait_msec(device, 2, 0x70004, 0x00000003, 0x00000000);

	if (taken < 0)

		nvkm_warn(&ltc->subdev, "LTC invalidate timeout\n");

	taken = nvkm_wait_msec(device, 2000, 0x70004, 0x00000003, 0x00000000);



	if (taken > 0)

		nvkm_debug(&ltc->subdev, "LTC invalidate took %lld ns\n", taken);
@@ -144,9 +142,7 @@ gf100_ltc_flush(struct nvkm_ltc *ltc) 
	s64 taken;



	nvkm_wr32(device, 0x70010, 0x00000001);

	taken = nvkm_wait_msec(device, 2, 0x70010, 0x00000003, 0x00000000);

	if (taken < 0)

		nvkm_warn(&ltc->subdev, "LTC flush timeout\n");

	taken = nvkm_wait_msec(device, 2000, 0x70010, 0x00000003, 0x00000000);



	if (taken > 0)

		nvkm_debug(&ltc->subdev, "LTC flush took %lld ns\n", taken);