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:37:32 +1000 |
| commit | 9220c6ba7007640f03510ddfdcb681f763f152c8 (patch) | |
| tree | 1d8dab36606efa9d26d677dc8a8772d065ef64d5 /drm/nouveau/nvkm/engine/gr/nv50.c | |
| parent | 608a1643ca9000085ede98508871c0bdde8386c5 (diff) | |
| download | nouveau-9220c6ba7007640f03510ddfdcb681f763f152c8.tar.gz | |
gr: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/gr/nv50.c')
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/nv50.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/nv50.c b/drm/nouveau/nvkm/engine/gr/nv50.c index ade34d8a4..3b482bcc2 100644 --- a/drm/nouveau/nvkm/engine/gr/nv50.c +++ b/drm/nouveau/nvkm/engine/gr/nv50.c @@ -285,8 +285,10 @@ g84_gr_tlb_flush(struct nvkm_engine *engine) nvkm_wr32(device, 0x100c80, 0x00000001); - if (!nv_wait(gr, 0x100c80, 0x00000001, 0x00000000)) - nv_error(gr, "vm flush timeout\n"); + nvkm_msec(device, 2000, + if (!(nvkm_rd32(device, 0x100c80) & 0x00000001)) + break; + ); nvkm_mask(device, 0x400500, 0x00000001, 0x00000001); spin_unlock_irqrestore(&gr->lock, flags); return timeout ? -EBUSY : 0; |