Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139288
b: refs/heads/master
c: 2bd8c47
h: refs/heads/master
v: v3
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Apr 1, 2009
1 parent 564abfe commit 320030a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b83734ec0975e1f53420b7a2d454612fc905a9d0
refs/heads/master: 2bd8c47597b2522795f5eb2e61c22dcfec5dfa6a
8 changes: 6 additions & 2 deletions trunk/drivers/video/via/accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,17 @@ int viafb_wait_engine_idle(void)
int loop = 0;

while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
VIA_VR_QUEUE_BUSY) && (loop++ < MAXLOOP))
VIA_VR_QUEUE_BUSY) && (loop < MAXLOOP)) {
loop++;
cpu_relax();
}

while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
(VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
(loop++ < MAXLOOP))
(loop < MAXLOOP)) {
loop++;
cpu_relax();
}

return loop >= MAXLOOP;
}

0 comments on commit 320030a

Please sign in to comment.