diff options
author | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:41 +0000 |
---|---|---|
committer | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:41 +0000 |
commit | e25f8e145f4f73b62c32389b922291fd561af9d2 (patch) | |
tree | 0112775ae632981137d8020d67f325ed99e08570 /src/i810_dri.c | |
parent | 9e8e19c6fde15fe5b9bb7532316dedeeca54b8d9 (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/i810_dri.c')
-rw-r--r-- | src/i810_dri.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/i810_dri.c b/src/i810_dri.c index 0750f3f8..b1f7cc60 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -290,7 +290,7 @@ I810DRIScreenInit(ScreenPtr pScreen) unsigned long dcacheHandle; int sysmem_size = 0; int back_size = 0; - int pitch_idx = 0; + unsigned int pitch_idx = 0; int bufs; int width = pScrn->displayWidth * pI810->cpp; int i; @@ -1497,6 +1497,11 @@ I810DRILeave(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"%s\n",strerror(errno)); return FALSE; } + if (pI810->cursorARGBHandle != 0) + if (drmAgpUnbind(pI810->drmSubFD, pI810->cursorARGBHandle) != 0) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"%s\n",strerror(errno)); + return FALSE; + } if (pI810->agpAcquired == TRUE) drmAgpRelease(pI810->drmSubFD); pI810->agpAcquired = FALSE; |