diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:40 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:40 +0000 |
| commit | e5ba473d7580881bc6baf6ed8622c73a1392df4b (patch) | |
| tree | 5554305ff8319577292daab391f427ff695d952a /src/r128_accel.c | |
| parent | dbeb8d28ac3469f4a7d7d8dae979ae876d4cdcba (diff) | |
Joined with branch XORG-6_8_2.lg3d-rel-0-6-2lg3d-masterlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-2lg3d-dev-0-6-1-1
Diffstat (limited to 'src/r128_accel.c')
| -rw-r--r-- | src/r128_accel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/r128_accel.c b/src/r128_accel.c index 90c5cb5f..ded73d5a 100644 --- a/src/r128_accel.c +++ b/src/r128_accel.c @@ -237,17 +237,23 @@ void R128CCEWaitForIdle(ScrnInfoPtr pScrn) i = 0; do { ret = drmCommandNone(info->drmFD, DRM_R128_CCE_IDLE); - } while ( ret && errno == EBUSY && i++ < R128_IDLE_RETRY ); + } while ( ret && errno == EBUSY && i++ < (R128_IDLE_RETRY * R128_IDLE_RETRY) ); if (ret && ret != -EBUSY) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: CCE idle %d\n", __FUNCTION__, ret); } + if (i > R128_IDLE_RETRY) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "%s: (DEBUG) CCE idle took i = %d\n", __FUNCTION__, i); + } + if (ret == 0) return; xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Idle timed out, resetting engine...\n"); + R128CCE_STOP(pScrn, info); R128EngineReset(pScrn); /* Always restart the engine when doing CCE 2D acceleration */ |