diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-03-15 18:45:07 -0400 | 
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-04-08 20:20:15 -0400 | 
| commit | 8e024f13142fbbca5fbe14a6926516a45bd70c3a (patch) | |
| tree | 3b9300b6afa1f0bd180ecf7be91a65c185ddf712 | |
| parent | 4528416291e26456e68f7217576e40e589d276bf (diff) | |
drm/nouveau: bail out of auxch transaction if we repeatedly recieve defers
There's one known case where we never stop recieving DEFER, and loop here
forever.  Lets not do that..
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dp.c | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index f954ad93e81f..deeb21c6865c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c | |||
| @@ -483,7 +483,7 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, | |||
| 483 | ctrl |= (cmd << NV50_AUXCH_CTRL_CMD_SHIFT); | 483 | ctrl |= (cmd << NV50_AUXCH_CTRL_CMD_SHIFT); | 
| 484 | ctrl |= ((data_nr - 1) << NV50_AUXCH_CTRL_LEN_SHIFT); | 484 | ctrl |= ((data_nr - 1) << NV50_AUXCH_CTRL_LEN_SHIFT); | 
| 485 | 485 | ||
| 486 | for (;;) { | 486 | for (i = 0; i < 16; i++) { | 
| 487 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x80000000); | 487 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x80000000); | 
| 488 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl); | 488 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl); | 
| 489 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x00010000); | 489 | nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x00010000); | 
| @@ -502,6 +502,12 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, | |||
| 502 | break; | 502 | break; | 
| 503 | } | 503 | } | 
| 504 | 504 | ||
| 505 | if (i == 16) { | ||
| 506 | NV_ERROR(dev, "auxch DEFER too many times, bailing\n"); | ||
| 507 | ret = -EREMOTEIO; | ||
| 508 | goto out; | ||
| 509 | } | ||
| 510 | |||
| 505 | if (cmd & 1) { | 511 | if (cmd & 1) { | 
| 506 | if ((stat & NV50_AUXCH_STAT_COUNT) != data_nr) { | 512 | if ((stat & NV50_AUXCH_STAT_COUNT) != data_nr) { | 
| 507 | ret = -EREMOTEIO; | 513 | ret = -EREMOTEIO; | 
