Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:20:26 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c
Log Message:
Notify radeon_fence_default_wait on fence signal.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.13 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.13 Mon Aug 27 13:34:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c Mon Aug 27 14:20:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_fence.c,v 1.13 2018/08/27 13:34:50 riastradh Exp $ */
+/* $NetBSD: radeon_fence.c,v 1.14 2018/08/27 14:20:26 riastradh Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -31,7 +31,7 @@
* Dave Airlie
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.13 2018/08/27 13:34:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.14 2018/08/27 14:20:26 riastradh Exp $");
#include <linux/seq_file.h>
#include <linux/atomic.h>
@@ -1158,13 +1158,28 @@ static inline bool radeon_test_signaled(
#ifdef __NetBSD__
+static void
+radeon_fence_wakeup_cb(struct fence *fence, struct fence_cb *cb)
+{
+ struct radeon_fence *rfence = to_radeon_fence(fence);
+ struct radeon_device *rdev = rfence->rdev;
+
+ BUG_ON(!spin_is_locked(&rdev->fence_lock));
+ cv_broadcast(&rdev->fence_queue);
+}
+
static signed long
radeon_fence_default_wait(struct fence *f, bool intr, signed long timo)
{
+ struct fence_cb fcb;
struct radeon_fence *fence = to_radeon_fence(f);
struct radeon_device *rdev = fence->rdev;
int r;
+ r = fence_add_callback(f, &fcb, radeon_fence_wakeup_cb);
+ if (r)
+ return r;
+
spin_lock(&rdev->fence_lock);
if (intr) {
DRM_SPIN_TIMED_WAIT_UNTIL(r, &rdev->fence_queue,
@@ -1177,6 +1192,8 @@ radeon_fence_default_wait(struct fence *
}
spin_unlock(&rdev->fence_lock);
+ (void)fence_remove_callback(f, &fcb);
+
return r;
}
