svn merge ^/branches/released .

6 files changed, 393 insertions, 11 deletions

diff --git a/xorg-server/miext/Makefile.am b/xorg-server/miext/Makefile.am
index 84ab70855..850c41c66 100644
--- a/xorg-server/miext/Makefile.am
+++ b/xorg-server/miext/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = damage shadow
-if COMPOSITE
-SUBDIRS += cw
-endif
-if XQUARTZ
-SUBDIRS += rootless
-endif
-if XWIN_MULTIWINDOWEXTWM
-SUBDIRS += rootless
-endif
-DIST_SUBDIRS = damage shadow cw rootless
+SUBDIRS = sync damage shadow

+if COMPOSITE

+SUBDIRS += cw

+endif

+if XQUARTZ

+SUBDIRS += rootless

+endif

+if XWIN_MULTIWINDOWEXTWM

+SUBDIRS += rootless

+endif

+DIST_SUBDIRS = sync damage shadow cw rootless

diff --git a/xorg-server/miext/sync/Makefile.am b/xorg-server/miext/sync/Makefile.am
new file mode 100644
index 000000000..2bfe44da1
--- /dev/null
+++ b/xorg-server/miext/sync/Makefile.am
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libsync.la

+

+AM_CFLAGS = $(DIX_CFLAGS)

+

+INCLUDES = 

+

+if XORG

+sdk_HEADERS = misync.h misyncstr.h

+endif

+

+libsync_la_SOURCES =	\

+	misync.c	\

+	misync.h	\

+	misyncstr.h

diff --git a/xorg-server/miext/sync/makefile b/xorg-server/miext/sync/makefile
new file mode 100644
index 000000000..007233627
--- /dev/null
+++ b/xorg-server/miext/sync/makefile
@@ -0,0 +1,4 @@
+LIBRARY = libsync

+

+CSRCS =	\

+	misync.c

diff --git a/xorg-server/miext/sync/misync.c b/xorg-server/miext/sync/misync.c
new file mode 100644
index 000000000..932376cf0
--- /dev/null
+++ b/xorg-server/miext/sync/misync.c
@@ -0,0 +1,201 @@
+/*

+ * 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;

+    free(pScreenPriv);

+

+    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;

+}

diff --git a/xorg-server/miext/sync/misync.h b/xorg-server/miext/sync/misync.h
new file mode 100644
index 000000000..644309324
--- /dev/null
+++ b/xorg-server/miext/sync/misync.h
@@ -0,0 +1,77 @@
+/*

+ * 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

+

+#ifndef _MISYNC_H_

+#define _MISYNC_H_

+

+typedef struct _SyncFence SyncFence;

+typedef struct _SyncTrigger SyncTrigger;

+

+typedef void (*SyncScreenCreateFenceFunc) (ScreenPtr pScreen,

+					   SyncFence* pFence,

+					   Bool initially_triggered);

+typedef void (*SyncScreenDestroyFenceFunc) (ScreenPtr pScreen,

+					    SyncFence* pFence);

+

+typedef struct _syncScreenFuncs {

+    SyncScreenCreateFenceFunc	CreateFence;

+    SyncScreenDestroyFenceFunc	DestroyFence;

+} SyncScreenFuncsRec, *SyncScreenFuncsPtr;

+

+extern _X_EXPORT void

+miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence* pFence,

+			Bool initially_triggered);

+extern _X_EXPORT void

+miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence* pFence);

+

+typedef void (*SyncFenceSetTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceResetFunc) (SyncFence* pFence);

+typedef Bool (*SyncFenceCheckTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceAddTriggerFunc) (SyncTrigger* pTrigger);

+typedef void (*SyncFenceDeleteTriggerFunc) (SyncTrigger* pTrigger);

+

+typedef struct _syncFenceFuncs {

+    SyncFenceSetTriggeredFunc	SetTriggered;

+    SyncFenceResetFunc		Reset;

+    SyncFenceCheckTriggeredFunc	CheckTriggered;

+    SyncFenceAddTriggerFunc	AddTrigger;

+    SyncFenceDeleteTriggerFunc	DeleteTrigger;

+} SyncFenceFuncsRec, *SyncFenceFuncsPtr;

+

+extern _X_EXPORT void

+miSyncInitFence(ScreenPtr pScreen, SyncFence* pFence, Bool initially_triggered);

+extern _X_EXPORT void

+miSyncDestroyFence(SyncFence* pFence);

+extern _X_EXPORT void

+miSyncTriggerFence(SyncFence* pFence);

+

+extern _X_EXPORT SyncScreenFuncsPtr

+miSyncGetScreenFuncs(ScreenPtr pScreen);

+extern _X_EXPORT Bool

+miSyncSetup(ScreenPtr pScreen);

+

+#endif /* _MISYNC_H_ */

diff --git a/xorg-server/miext/sync/misyncstr.h b/xorg-server/miext/sync/misyncstr.h
new file mode 100644
index 000000000..9b0f24365
--- /dev/null
+++ b/xorg-server/miext/sync/misyncstr.h
@@ -0,0 +1,86 @@
+/*

+ * 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

+

+#ifndef _MISYNCSTR_H_

+#define _MISYNCSTR_H_

+

+#include "dix.h"

+#include <X11/extensions/syncconst.h>

+

+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

+

+/* Sync object types */

+#define SYNC_COUNTER		0

+#define SYNC_FENCE		1

+

+typedef struct _SyncObject {

+    ClientPtr		client;	/* Owning client. 0 for system counters */

+    struct _SyncTriggerList *pTriglist;	/* list of triggers */

+    XID			id;		/* resource ID */

+    unsigned char	type;		/* SYNC_* */

+    Bool		beingDestroyed;	/* in process of going away */

+} SyncObject;

+

+typedef struct _SyncCounter {

+    SyncObject		sync;		/* Common sync object data */

+    CARD64		value;		/* counter value */

+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */

+} SyncCounter;

+

+struct _SyncFence {

+    SyncObject		sync;		/* Common sync object data */

+    ScreenPtr		pScreen;	/* Screen of this fence object */

+    SyncFenceFuncsRec	funcs;		/* Funcs for performing ops on fence */

+    Bool		triggered;	/* fence state */

+    PrivateRec		*devPrivates;	/* driver-specific per-fence data */

+};

+

+struct _SyncTrigger {

+    SyncObject *pSync;

+    CARD64	wait_value;	/* wait value */

+    unsigned int value_type;	/* Absolute or Relative */

+    unsigned int test_type;	/* transition or Comparision type */

+    CARD64	test_value;	/* trigger event threshold value */

+    Bool	(*CheckTrigger)(

+				struct _SyncTrigger * /*pTrigger*/,

+				CARD64 /*newval*/

+				);

+    void	(*TriggerFired)(

+				struct _SyncTrigger * /*pTrigger*/

+				);

+    void	(*CounterDestroyed)(

+				struct _SyncTrigger * /*pTrigger*/

+				    );

+};

+

+typedef struct _SyncTriggerList {

+    SyncTrigger *pTrigger;

+    struct _SyncTriggerList *next;

+} SyncTriggerList;

+

+#endif /* _MISYNCSTR_H_ */

+