Skip to content

Commit 0156e76

Browse files
author
Ben Skeggs
committed
drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
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 <[email protected]>
1 parent 72923e2 commit 0156e76

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
118118
if (retries)
119119
udelay(400);
120120

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

124-
timeout = 1000;
124+
timeout = 2000;
125125
do {
126126
ctrl = nvkm_rd32(device, 0x00e4e4 + base);
127127
udelay(1);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
118118
if (retries)
119119
udelay(400);
120120

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

124-
timeout = 1000;
124+
timeout = 2000;
125125
do {
126126
ctrl = nvkm_rd32(device, 0x00d954 + base);
127127
udelay(1);

0 commit comments

Comments
 (0)