diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:21 +1000 |
| commit | c4584adc37720b65ae44a84c660d47b3ebcf7dfb (patch) | |
| tree | 6a85744ead2ecaa87ce76aad08f679a6eb414c3c /drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | |
| parent | drm/nouveau/fifo: switch to new-style timer macros (diff) | |
| download | linux-dev-c4584adc37720b65ae44a84c660d47b3ebcf7dfb.tar.xz linux-dev-c4584adc37720b65ae44a84c660d47b3ebcf7dfb.zip | |
drm/nouveau/gr: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c index d1792ef62712..33f3b8219213 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c @@ -1206,7 +1206,10 @@ nv04_gr_idle(void *obj) if (nv_device(obj)->card_type == NV_40) mask &= ~NV40_PGRAPH_STATUS_SYNC_STALL; - if (!nv_wait(gr, NV04_PGRAPH_STATUS, mask, 0)) { + if (nvkm_msec(device, 2000, + if (!(nvkm_rd32(device, NV04_PGRAPH_STATUS) & mask)) + break; + ) < 0) { nv_error(gr, "idle timed out with status 0x%08x\n", nvkm_rd32(device, NV04_PGRAPH_STATUS)); return false; |