9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
202 lines
5.3 KiB
C
202 lines
5.3 KiB
C
/*
|
|
* Copyright © 2010 NVIDIA Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include "scrnintstr.h"
|
|
#include "misync.h"
|
|
#include "misyncstr.h"
|
|
|
|
static DevPrivateKeyRec syncScreenPrivateKeyRec;
|
|
static DevPrivateKey syncScreenPrivateKey = &syncScreenPrivateKeyRec;
|
|
|
|
#define SYNC_SCREEN_PRIV(pScreen) \
|
|
(SyncScreenPrivPtr) dixLookupPrivate(&pScreen->devPrivates, \
|
|
syncScreenPrivateKey)
|
|
|
|
typedef struct _syncScreenPriv {
|
|
/* Wrappable sync-specific screen functions */
|
|
SyncScreenFuncsRec funcs;
|
|
|
|
/* Wrapped screen functions */
|
|
CloseScreenProcPtr CloseScreen;
|
|
} SyncScreenPrivRec, *SyncScreenPrivPtr;
|
|
|
|
/* Default implementations of the sync screen functions */
|
|
void
|
|
miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence,
|
|
Bool initially_triggered)
|
|
{
|
|
(void) pScreen;
|
|
|
|
pFence->triggered = initially_triggered;
|
|
}
|
|
|
|
void
|
|
miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence * pFence)
|
|
{
|
|
(void) pScreen;
|
|
(void) pFence;
|
|
}
|
|
|
|
/* Default implementations of the per-object functions */
|
|
static void
|
|
miSyncFenceSetTriggered(SyncFence * pFence)
|
|
{
|
|
pFence->triggered = TRUE;
|
|
}
|
|
|
|
static void
|
|
miSyncFenceReset(SyncFence * pFence)
|
|
{
|
|
pFence->triggered = FALSE;
|
|
}
|
|
|
|
static Bool
|
|
miSyncFenceCheckTriggered(SyncFence * pFence)
|
|
{
|
|
return pFence->triggered;
|
|
}
|
|
|
|
static void
|
|
miSyncFenceAddTrigger(SyncTrigger * pTrigger)
|
|
{
|
|
(void) pTrigger;
|
|
|
|
return;
|
|
}
|
|
|
|
static void
|
|
miSyncFenceDeleteTrigger(SyncTrigger * pTrigger)
|
|
{
|
|
(void) pTrigger;
|
|
|
|
return;
|
|
}
|
|
|
|
/* Machine independent portion of the fence sync object implementation */
|
|
void
|
|
miSyncInitFence(ScreenPtr pScreen, SyncFence * pFence, Bool initially_triggered)
|
|
{
|
|
SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
|
|
|
|
static const SyncFenceFuncsRec miSyncFenceFuncs = {
|
|
&miSyncFenceSetTriggered,
|
|
&miSyncFenceReset,
|
|
&miSyncFenceCheckTriggered,
|
|
&miSyncFenceAddTrigger,
|
|
&miSyncFenceDeleteTrigger
|
|
};
|
|
|
|
pFence->pScreen = pScreen;
|
|
pFence->funcs = miSyncFenceFuncs;
|
|
|
|
pScreenPriv->funcs.CreateFence(pScreen, pFence, initially_triggered);
|
|
}
|
|
|
|
void
|
|
miSyncDestroyFence(SyncFence * pFence)
|
|
{
|
|
ScreenPtr pScreen = pFence->pScreen;
|
|
SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
|
|
SyncTriggerList *ptl, *pNext;
|
|
|
|
pFence->sync.beingDestroyed = TRUE;
|
|
/* tell all the fence's triggers that the counter has been destroyed */
|
|
for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext) {
|
|
(*ptl->pTrigger->CounterDestroyed) (ptl->pTrigger);
|
|
pNext = ptl->next;
|
|
free(ptl); /* destroy the trigger list as we go */
|
|
}
|
|
|
|
pScreenPriv->funcs.DestroyFence(pScreen, pFence);
|
|
|
|
dixFreeObjectWithPrivates(pFence, PRIVATE_SYNC_FENCE);
|
|
}
|
|
|
|
void
|
|
miSyncTriggerFence(SyncFence * pFence)
|
|
{
|
|
SyncTriggerList *ptl, *pNext;
|
|
CARD64 unused;
|
|
|
|
pFence->funcs.SetTriggered(pFence);
|
|
|
|
XSyncIntToValue(&unused, 0L);
|
|
|
|
/* run through triggers to see if any fired */
|
|
for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext) {
|
|
pNext = ptl->next;
|
|
if ((*ptl->pTrigger->CheckTrigger) (ptl->pTrigger, unused))
|
|
(*ptl->pTrigger->TriggerFired) (ptl->pTrigger);
|
|
}
|
|
}
|
|
|
|
SyncScreenFuncsPtr
|
|
miSyncGetScreenFuncs(ScreenPtr pScreen)
|
|
{
|
|
SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
|
|
|
|
return &pScreenPriv->funcs;
|
|
}
|
|
|
|
static Bool
|
|
SyncCloseScreen(int i, ScreenPtr pScreen)
|
|
{
|
|
SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
|
|
|
|
pScreen->CloseScreen = pScreenPriv->CloseScreen;
|
|
|
|
return (*pScreen->CloseScreen) (i, pScreen);
|
|
}
|
|
|
|
Bool
|
|
miSyncSetup(ScreenPtr pScreen)
|
|
{
|
|
SyncScreenPrivPtr pScreenPriv;
|
|
|
|
static const SyncScreenFuncsRec miSyncScreenFuncs = {
|
|
&miSyncScreenCreateFence,
|
|
&miSyncScreenDestroyFence
|
|
};
|
|
|
|
if (dixPrivateKeyRegistered(syncScreenPrivateKey))
|
|
return TRUE;
|
|
|
|
if (!dixRegisterPrivateKey(syncScreenPrivateKey, PRIVATE_SCREEN,
|
|
sizeof(SyncScreenPrivRec)))
|
|
return FALSE;
|
|
|
|
pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
|
|
|
|
pScreenPriv->funcs = miSyncScreenFuncs;
|
|
|
|
/* Wrap CloseScreen to clean up */
|
|
pScreenPriv->CloseScreen = pScreen->CloseScreen;
|
|
pScreen->CloseScreen = SyncCloseScreen;
|
|
|
|
return TRUE;
|
|
}
|