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

Commit 237169c0 authored Jun 23, 2020 by Ben Skeggs Committed by Greg Kroah-Hartman Jul 31, 2020

drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout



[ Upstream commit 0156e76d388310a490aeb0f2fbb5b284ded3aecc ]

Tegra TRM says worst-case reply time is 1216us, and this should fix some
spurious timeouts that have been popping up.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 31b10f2c

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
		if (retries)
		udelay(400);

		/* transaction request, wait up to 1ms for it to complete */
		/* transaction request, wait up to 2ms for it to complete */
		nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 \| ctrl);

		timeout = 1000;
		timeout = 2000;
		do {
		ctrl = nvkm_rd32(device, 0x00e4e4 + base);
		udelay(1);

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
		if (retries)
		udelay(400);

		/* transaction request, wait up to 1ms for it to complete */
		/* transaction request, wait up to 2ms for it to complete */
		nvkm_wr32(device, 0x00d954 + base, 0x00010000 \| ctrl);

		timeout = 1000;
		timeout = 2000;
		do {
		ctrl = nvkm_rd32(device, 0x00d954 + base);
		udelay(1);