1 files changed, 53 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_sync.c b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
index e7bc4fcd5e..c47ff3a985 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_sync.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
+ *
+ * All Rights Reserved.
+ *
+ * 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
+ *
+ */
+
 #include "vblank.h" /* for DO_USLEEP */
 
 #include "nouveau_context.h"
@@ -9,7 +36,7 @@
 #include "nouveau_sync.h"
 
 nouveau_notifier *
-nouveau_notifier_new(GLcontext *ctx, GLuint handle)
+nouveau_notifier_new(GLcontext *ctx, GLuint handle, GLuint count)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 	nouveau_notifier *notifier;
@@ -24,7 +51,7 @@ nouveau_notifier_new(GLcontext *ctx, GLuint handle)
 
 	notifier->mem = nouveau_mem_alloc(ctx,
 					  NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED,
-					  32,
+					  count * NV_NOTIFIER_SIZE,
 					  0);
 	if (!notifier->mem) {
 		FREE(notifier);
@@ -53,9 +80,9 @@ nouveau_notifier_destroy(GLcontext *ctx, nouveau_notifier *notifier)
 }
 
 void
-nouveau_notifier_reset(nouveau_notifier *notifier)
+nouveau_notifier_reset(nouveau_notifier *notifier, GLuint id)
 {
-	volatile GLuint *n = notifier->mem->map;
+	volatile GLuint *n = notifier->mem->map + (id * NV_NOTIFIER_SIZE);
 
 #ifdef NOUVEAU_RING_DEBUG
 	return;
@@ -68,11 +95,27 @@ nouveau_notifier_reset(nouveau_notifier *notifier)
 				       NV_NOTIFY_STATE_STATUS_SHIFT);
 }
 
+GLuint
+nouveau_notifier_status(nouveau_notifier *notifier, GLuint id)
+{
+	volatile GLuint *n = notifier->mem->map + (id * NV_NOTIFIER_SIZE);
+
+	return n[NV_NOTIFY_STATE/4] >> NV_NOTIFY_STATE_STATUS_SHIFT;
+}
+
+GLuint
+nouveau_notifier_return_val(nouveau_notifier *notifier, GLuint id)
+{
+	volatile GLuint *n = notifier->mem->map + (id * NV_NOTIFIER_SIZE);
+
+	return n[NV_NOTIFY_RETURN_VALUE/4];
+}
+
 GLboolean
-nouveau_notifier_wait_status(nouveau_notifier *notifier, GLuint status,
-							 GLuint timeout)
+nouveau_notifier_wait_status(nouveau_notifier *notifier, GLuint id,
+			     GLuint status, GLuint timeout)
 {
-	volatile GLuint *n = notifier->mem->map;
+	volatile GLuint *n = notifier->mem->map + (id * NV_NOTIFIER_SIZE);
 	unsigned int time = 0;
 
 #ifdef NOUVEAU_RING_DEBUG
@@ -108,7 +151,7 @@ nouveau_notifier_wait_nop(GLcontext *ctx, nouveau_notifier *notifier,
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 	GLboolean ret;
 
-	nouveau_notifier_reset(notifier);
+	nouveau_notifier_reset(notifier, 0);
 
 	BEGIN_RING_SIZE(subc, NV_NOTIFY, 1);
 	OUT_RING       (NV_NOTIFY_STYLE_WRITE_ONLY);
@@ -116,7 +159,7 @@ nouveau_notifier_wait_nop(GLcontext *ctx, nouveau_notifier *notifier,
 	OUT_RING       (0);
 	FIRE_RING();
 
-	ret = nouveau_notifier_wait_status(notifier,
+	ret = nouveau_notifier_wait_status(notifier, 0,
 					   NV_NOTIFY_STATE_STATUS_COMPLETED,
 					   0 /* no timeout */);
 	if (ret == GL_FALSE) MESSAGE("wait on notifier failed\n");
@@ -130,7 +173,7 @@ GLboolean nouveauSyncInitFuncs(GLcontext *ctx)
 	return GL_TRUE;
 #endif
 
-	nmesa->syncNotifier = nouveau_notifier_new(ctx, NvSyncNotify);
+	nmesa->syncNotifier = nouveau_notifier_new(ctx, NvSyncNotify, 1);
 	if (!nmesa->syncNotifier) {
 		MESSAGE("Failed to create channel sync notifier\n");
 		return GL_FALSE;