| From 4f9dee14743912a39b2529bcc6650ff11caaaba9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 23 Jun 2020 16:39:13 +1000 |
| Subject: drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| [ 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> |
| --- |
| drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 ++-- |
| drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c |
| index 954f5b76bfcf7..d44965f805fe9 100644 |
| --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c |
| +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c |
| @@ -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); |
| diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c |
| index bed231b56dbd2..7cac8fe372b6b 100644 |
| --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c |
| +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c |
| @@ -118,10 +118,10 @@ gm204_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); |
| -- |
| 2.25.1 |
| |