From 320030abb37deb240574b5ab8f50646ebb93ade4 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 31 Mar 2009 15:25:36 -0700 Subject: [PATCH] --- yaml --- r: 139288 b: refs/heads/master c: 2bd8c47597b2522795f5eb2e61c22dcfec5dfa6a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/via/accel.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab2ccf1e29b5..f75d3bd1896f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b83734ec0975e1f53420b7a2d454612fc905a9d0 +refs/heads/master: 2bd8c47597b2522795f5eb2e61c22dcfec5dfa6a diff --git a/trunk/drivers/video/via/accel.c b/trunk/drivers/video/via/accel.c index 632523ff1fb7..45c54bfe99bb 100644 --- a/trunk/drivers/video/via/accel.c +++ b/trunk/drivers/video/via/accel.c @@ -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; }