leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/ibus: switch to new-style timer macros

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:11 +10:00
parent cf07d861ce
commit 63bb5c390b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c
View File

@ -59,9 +59,10 @@ gk20a_ibus_intr(struct nvkm_subdev *subdev)
/* Acknowledge interrupt */ /* Acknowledge interrupt */
nvkm_mask(device, 0x12004c, 0x2, 0x2); nvkm_mask(device, 0x12004c, 0x2, 0x2);
nvkm_msec(device, 2000,
if (!nv_wait(subdev, 0x12004c, 0x3f, 0x00)) if (!(nvkm_rd32(device, 0x12004c) & 0x0000003f))
nv_warn(ibus, "timeout waiting for ringmaster ack\n"); break;
);
} }
static int static int