andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #3284: Make the DRI lock reference count per-screen.

Browse Source
This commit is contained in:
Adam Jackson 2005-09-13 00:44:52 +00:00
parent 846f797f37
commit b290884719
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xfree86/dri/dri.c
View File

@ -79,7 +79,6 @@ static int DRIScreenPrivIndex = -1;
static int DRIWindowPrivIndex = -1; static int DRIWindowPrivIndex = -1;
static unsigned long DRIGeneration = 0; static unsigned long DRIGeneration = 0;
static unsigned int DRIDrawableValidationStamp = 0; static unsigned int DRIDrawableValidationStamp = 0;
static int lockRefCount=0;
/* Support cleanup for fullscreen mode, /* Support cleanup for fullscreen mode,
independent of the DRICreateDrawable independent of the DRICreateDrawable
@ -565,7 +564,7 @@ DRICloseScreen(ScreenPtr pScreen)
/* Make sure signals get unblocked etc. */ /* Make sure signals get unblocked etc. */
drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext); drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext);
lockRefCount=0; pDRIPriv->lockRefCount = 0;
DRIDrvMsg(pScreen->myNum, X_INFO, DRIDrvMsg(pScreen->myNum, X_INFO,
"[drm] unmapping %d bytes of SAREA %p at %p\n", "[drm] unmapping %d bytes of SAREA %p at %p\n",
pDRIInfo->SAREASize, pDRIInfo->SAREASize,
@ -1910,9 +1909,9 @@ DRILock(ScreenPtr pScreen, int flags)
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
if(!pDRIPriv) return; if(!pDRIPriv) return;
if (!lockRefCount) if (!pDRIPriv->lockRefCount)
DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext, flags); DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext, flags);
lockRefCount++; pDRIPriv->lockRefCount++;
} }
void void
@ -1921,14 +1920,14 @@ DRIUnlock(ScreenPtr pScreen)
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
if(!pDRIPriv) return; if(!pDRIPriv) return;
if (lockRefCount > 0) { if (pDRIPriv->lockRefCount > 0) {
lockRefCount--; pDRIPriv->lockRefCount--;
} }
else { else {
ErrorF("DRIUnlock called when not locked\n"); ErrorF("DRIUnlock called when not locked\n");
return; return;
} }
if (!lockRefCount) if (!pDRIPriv->lockRefCount)
DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext); DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext);
} }

1
hw/xfree86/dri/dristruct.h
View File

@ -99,6 +99,7 @@ typedef struct _DRIScreenPrivRec
Bool grabbedDRILock; Bool grabbedDRILock;
Bool drmSIGIOHandlerInstalled; Bool drmSIGIOHandlerInstalled;
Bool wrapped; Bool wrapped;
int lockRefCount;
} DRIScreenPrivRec, *DRIScreenPrivPtr; } DRIScreenPrivRec, *DRIScreenPrivPtr;
#endif /* DRI_STRUCT_H */ #endif /* DRI_STRUCT_H */