Module Name: src
Committed By: riastradh
Date: Wed Aug 29 14:53:46 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c
Log Message:
Return timeout left, not error, if fence is already signaled.
fence_add_callback returns -ENOENT if fence is already signaled;
radeon_fence_default_wait is supposed to wait until fence is
signaled; this means its job is done.
Should fix spurious ENOENT in DRM_IOCTL_RADEON_GEM_WAIT_IDLE (or
_IOW('d',0x64,0x8) for you ktracers out there).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
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.14 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.14 Mon Aug 27 14:20:26 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c Wed Aug 29 14:53:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_fence.c,v 1.14 2018/08/27 14:20:26 riastradh Exp $ */
+/* $NetBSD: radeon_fence.c,v 1.15 2018/08/29 14:53:46 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.14 2018/08/27 14:20:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.15 2018/08/29 14:53:46 riastradh Exp $");
#include <linux/seq_file.h>
#include <linux/atomic.h>
@@ -1177,8 +1177,8 @@ radeon_fence_default_wait(struct fence *
int r;
r = fence_add_callback(f, &fcb, radeon_fence_wakeup_cb);
- if (r)
- return r;
+ if (r) /* fence is done already */
+ return timo;
spin_lock(&rdev->fence_lock);
if (intr) {
