diff options
| author | David Nusinow <[email protected]> | 2006-09-24 21:21:15 +0000 |
|---|---|---|
| committer | David Nusinow <[email protected]> | 2006-09-24 21:21:15 +0000 |
| commit | 387acaac6925e42f47031f26360e33a3f30e7312 (patch) | |
| tree | a4218beb5aa67b58a74299d899dab9f2f44f971e /src/mesa/drivers/dri/r300/radeon_ioctl.c | |
| parent | 952b775dbe0fb434310808058d96931b832050da (diff) | |
* New upstream version
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_ioctl.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_ioctl.c b/src/mesa/drivers/dri/r300/radeon_ioctl.c index 798e83c0107..d5b53194189 100644 --- a/src/mesa/drivers/dri/r300/radeon_ioctl.c +++ b/src/mesa/drivers/dri/r300/radeon_ioctl.c @@ -122,7 +122,7 @@ static void radeonWaitIrq(radeonContextPtr radeon) do { ret = drmCommandWrite(radeon->dri.fd, DRM_RADEON_IRQ_WAIT, &radeon->iw, sizeof(radeon->iw)); - } while (ret && (errno == EINTR || errno == EAGAIN)); + } while (ret && (errno == EINTR || errno == EBUSY)); if (ret) { fprintf(stderr, "%s: drmRadeonIrqWait: %d\n", __FUNCTION__, @@ -183,10 +183,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv, (void *)radeon->glCtx); } - if (IS_R200_CLASS(radeon->radeonScreen)) - R200_FIREVERTICES((r200ContextPtr)radeon); - else - r300Flush(radeon->glCtx); + r300Flush(radeon->glCtx); LOCK_HARDWARE(radeon); @@ -283,10 +280,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv) radeon->sarea->pfCurrentPage); } - if (IS_R200_CLASS(radeon->radeonScreen)) - R200_FIREVERTICES((r200ContextPtr)radeon); - else - r300Flush(radeon->glCtx); + r300Flush(radeon->glCtx); LOCK_HARDWARE(radeon); if (!dPriv->numClipRects) { |