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:20 +1000 |
| commit | 63bb5c390bf2f975f0936b6523af6784af811b49 (patch) | |
| tree | 2a495650c5a05aeb2257fb8235cd2bcfb920156d /drivers/gpu/drm/nouveau/nvkm/subdev/ibus | |
| parent | cf07d861ce3c4bfd9d45f9e66f30cbfb56dca3a0 (diff) | |
| download | blackbird-op-linux-63bb5c390bf2f975f0936b6523af6784af811b49.tar.gz blackbird-op-linux-63bb5c390bf2f975f0936b6523af6784af811b49.zip | |
drm/nouveau/ibus: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/ibus')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c index 1b676aaecc88..611fc7165469 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c @@ -59,9 +59,10 @@ gk20a_ibus_intr(struct nvkm_subdev *subdev) /* Acknowledge interrupt */ nvkm_mask(device, 0x12004c, 0x2, 0x2); - - if (!nv_wait(subdev, 0x12004c, 0x3f, 0x00)) - nv_warn(ibus, "timeout waiting for ringmaster ack\n"); + nvkm_msec(device, 2000, + if (!(nvkm_rd32(device, 0x12004c) & 0x0000003f)) + break; + ); } static int |
