WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_semaphore.c

 /*
  * Copyright 2011 Christian König.
  * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
  * THE COPYRIGHT HOLDERS, AUTHORS 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.
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
+ *
  */
 /*
  * Authors:
  *    Christian König
  */
 #include
 #include "radeon.h"
+#include "radeon_trace.h"
 int radeon_semaphore_create(struct radeon_device *rdev,
 			    struct radeon_semaphore **semaphore)
+{
+	uint32_t *cpu_addr;
-	int r;
+	int i, r;
 	*semaphore = kmalloc(sizeof(struct radeon_semaphore), GFP_KERNEL);
 	if (*semaphore == NULL) {
 		return -ENOMEM;
+	}
-	r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo,
+	r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &(*semaphore)->sa_bo,
-			     &(*semaphore)->sa_bo, 8, 8, true);
+* RADEON_NUM_SYNCS, 8);
 	if (r) {
 		kfree(*semaphore);
 		*semaphore = NULL;
 		return r;
+	}
 	(*semaphore)->waiters = 0;
 	(*semaphore)->gpu_addr = radeon_sa_bo_gpu_addr((*semaphore)->sa_bo);
-	*((uint64_t*)radeon_sa_bo_cpu_addr((*semaphore)->sa_bo)) = 0;
+	cpu_addr = radeon_sa_bo_cpu_addr((*semaphore)->sa_bo);
+	for (i = 0; i < RADEON_NUM_SYNCS; ++i)
+		cpu_addr[i] = 0;
+	for (i = 0; i < RADEON_NUM_RINGS; ++i)
+		(*semaphore)->sync_to[i] = NULL;
 	return 0;
+}
-void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,
+bool radeon_semaphore_emit_signal(struct radeon_device *rdev, int ridx,
 			          struct radeon_semaphore *semaphore)
+{
+	struct radeon_ring *ring = &rdev->ring[ridx];
+	trace_radeon_semaphore_signale(ridx, semaphore);
 	if (radeon_semaphore_ring_emit(rdev, ridx, ring, semaphore, false)) {
+	--semaphore->waiters;
-	--semaphore->waiters;
+		/* for debugging lockup only, used by sysfs debug files */
+		ring->last_semaphore_signal_addr = semaphore->gpu_addr;
+		return true;
+	}
-	radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, false);
+	return false;
 }
-void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,
+bool radeon_semaphore_emit_wait(struct radeon_device *rdev, int ridx,
+			        struct radeon_semaphore *semaphore)
+{
+	struct radeon_ring *ring = &rdev->ring[ridx];
+	trace_radeon_semaphore_wait(ridx, semaphore);
 			        struct radeon_semaphore *semaphore)
+	if (radeon_semaphore_ring_emit(rdev, ridx, ring, semaphore, true)) {
+	++semaphore->waiters;
-{
+		/* for debugging lockup only, used by sysfs debug files */
-	++semaphore->waiters;
+		ring->last_semaphore_wait_addr = semaphore->gpu_addr;
+		return true;
+	}
+	return false;
+}
+/**
+ * radeon_semaphore_sync_to - use the semaphore to sync to a fence
+ *
+ * @semaphore: semaphore object to add fence to
+ * @fence: fence to sync to
+ *
+ * Sync to the fence using this semaphore object
+ */
+void radeon_semaphore_sync_to(struct radeon_semaphore *semaphore,
+			      struct radeon_fence *fence)
+{
+        struct radeon_fence *other;
+        if (!fence)
+                return;
+        other = semaphore->sync_to[fence->ring];
+        semaphore->sync_to[fence->ring] = radeon_fence_later(fence, other);
+}
+/**
+ * radeon_semaphore_sync_rings - sync ring to all registered fences
+ *
+ * @rdev: radeon_device pointer
+ * @semaphore: semaphore object to use for sync
-	radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, true);
+ * @ring: ring that needs sync
+ *
  * Ensure that all registered fences are signaled before letting
  * the ring continue. The caller must hold the ring lock.
-/* caller must hold ring lock */
+ */
 int radeon_semaphore_sync_rings(struct radeon_device *rdev,
+				struct radeon_semaphore *semaphore,
-				struct radeon_semaphore *semaphore,
+				int ring)
-				int signaler, int waiter)
+{
+	unsigned count = 0;
+	int i, r;
-{
+        for (i = 0; i < RADEON_NUM_RINGS; ++i) {
-	int r;
+		struct radeon_fence *fence = semaphore->sync_to[i];
 	/* no need to signal and wait on the same ring */
-	if (signaler == waiter) {
+		/* check if we really need to sync */
-		return 0;
+                if (!radeon_fence_need_sync(fence, ring))
 			continue;
 	/* prevent GPU deadlocks */
-	if (!rdev->ring[signaler].ready) {
+		if (!rdev->ring[i].ready) {
-		dev_err(rdev->dev, "Trying to sync to a disabled ring!");
+			dev_err(rdev->dev, "Syncing to a disabled ring!");
 		return -EINVAL;
+	}
+		if (++count > RADEON_NUM_SYNCS) {
+			/* not enough room, wait manually */
+			r = radeon_fence_wait(fence, false);
+			if (r)
+				return r;
+			continue;
+		}
+		/* allocate enough space for sync command */
-	r = radeon_ring_alloc(rdev, &rdev->ring[signaler], 8);
+		r = radeon_ring_alloc(rdev, &rdev->ring[i], 16);
 	if (r) {
 		return r;
+	}
+		/* emit the signal semaphore */
-	radeon_semaphore_emit_signal(rdev, signaler, semaphore);
+		if (!radeon_semaphore_emit_signal(rdev, i, semaphore)) {
+			/* signaling wasn't successful wait manually */
-	radeon_ring_commit(rdev, &rdev->ring[signaler]);
+			radeon_ring_undo(&rdev->ring[i]);
+			r = radeon_fence_wait(fence, false);
+			if (r)
+				return r;
+			continue;
+		}
 	/* we assume caller has already allocated space on waiters ring */
+		if (!radeon_semaphore_emit_wait(rdev, ring, semaphore)) {
+			/* waiting wasn't successful wait manually */
+			radeon_ring_undo(&rdev->ring[i]);
+			r = radeon_fence_wait(fence, false);
+			if (r)
+				return r;
+			continue;
-	radeon_semaphore_emit_wait(rdev, waiter, semaphore);
+		}
+		radeon_ring_commit(rdev, &rdev->ring[i], false);
-	/* for debugging lockup only, used by sysfs debug files */
+		radeon_fence_note_sync(fence, ring);
-	rdev->ring[signaler].last_semaphore_signal_addr = semaphore->gpu_addr;
+		semaphore->gpu_addr += 8;
 	rdev->ring[waiter].last_semaphore_wait_addr = semaphore->gpu_addr;
 	return 0;
+}
 void radeon_semaphore_free(struct radeon_device *rdev,
 			   struct radeon_semaphore **semaphore,
 			   struct radeon_fence *fence)
+{
 	if (semaphore == NULL || *semaphore == NULL) {
 		return;
+	}
 	if ((*semaphore)->waiters > 0) {
 		dev_err(rdev->dev, "semaphore %p has more waiters than signalers,"
 			" hardware lockup imminent!\n", *semaphore);
+	}
 	radeon_sa_bo_free(rdev, &(*semaphore)->sa_bo, fence);
 	kfree(*semaphore);
 	*semaphore = NULL;
+}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_semaphore.c – Rev 3764 → 5078