frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so 

we only take it when clipping a DRI drawable instead of on every tree
    update. Note drawable lock acquisition per- screen instead of globally,
    and drop it in BlockHandler if necessary.
This commit is contained in:
Adam Jackson 2006-01-06 18:06:02 +00:00
parent 39ce5f1544
commit fe0c838b5d
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/dri/dri.c:
* hw/xfree86/dri/dristruct.h:
Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so we only take it when
clipping a DRI drawable instead of on every tree update. Note drawable lock acquisition per-
screen instead of globally, and drop it in BlockHandler if necessary.
2006-01-06 Adam Jackson <ajax@freedesktop.org> 2006-01-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/loader/misym.c: * hw/xfree86/loader/misym.c:

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

@ -1405,6 +1405,11 @@ DRIDoBlockHandler(int screenNum, pointer blockData,
DRI_2D_CONTEXT, DRI_2D_CONTEXT,
pDRIPriv->partial3DContextStore); pDRIPriv->partial3DContextStore);
} }
if (pDRIPriv->windowsTouched)
DRM_SPINUNLOCK(&pDRIPriv->pSAREA->drawable_lock, 1);
pDRIPriv->windowsTouched = FALSE;
DRIUnlock(pScreen); DRIUnlock(pScreen);
} }
@ -1751,13 +1756,6 @@ DRILockTree(ScreenPtr pScreen)
} }
} }
/* It appears that somebody is relying on the lock being set even
if we aren't touching 3D windows */
#define DRI_BROKEN
static Bool DRIWindowsTouched = FALSE;
int int
DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
{ {
@ -1768,15 +1766,6 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
if(!pDRIPriv) return returnValue; if(!pDRIPriv) return returnValue;
DRIWindowsTouched = FALSE;
#ifdef DRI_BROKEN
if(!DRIWindowsTouched) {
DRILockTree(pScreen);
DRIWindowsTouched = TRUE;
}
#endif
/* call lower wrapped functions */ /* call lower wrapped functions */
if(pDRIPriv->wrap.ValidateTree) { if(pDRIPriv->wrap.ValidateTree) {
/* unwrap */ /* unwrap */
@ -1817,12 +1806,6 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree; pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
pScreen->PostValidateTree = DRIPostValidateTree; pScreen->PostValidateTree = DRIPostValidateTree;
} }
if (DRIWindowsTouched) {
/* Release spin lock */
DRM_SPINUNLOCK(&pDRIPriv->pSAREA->drawable_lock, 1);
DRIWindowsTouched = FALSE;
}
} }
void void
@ -1836,12 +1819,10 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) { if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
#ifndef DRI_BROKEN if(!pDRIPriv->windowsTouched) {
if(!DRIWindowsTouched) {
DRILockTree(pScreen); DRILockTree(pScreen);
DRIWindowsTouched = TRUE; pDRIPriv->windowsTouched = TRUE;
} }
#endif
pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
= DRIDrawableValidationStamp++; = DRIDrawableValidationStamp++;

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;
Bool windowsTouched;
int lockRefCount; int lockRefCount;
} DRIScreenPrivRec, *DRIScreenPrivPtr; } DRIScreenPrivRec, *DRIScreenPrivPtr;