summaryrefslogtreecommitdiff
path: root/src/i810_dri.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-02-11 10:53:14 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-02-11 10:53:14 +0000
commitff85060489abea5cd9df8080be19ad000af9b2bc (patch)
tree0112775ae632981137d8020d67f325ed99e08570 /src/i810_dri.c
parent26f276bb2fe9d2a38b52968b0604b1b184e95329 (diff)
Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGECYGWIN
Diffstat (limited to 'src/i810_dri.c')
-rw-r--r--src/i810_dri.c7
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;