[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Return timeout left, n...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e9345925348
branches:  trunk
changeset: 366493:8e9345925348
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Aug 29 14:53:46 2018 +0000

description:
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).

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r a80f85a2da1f -r 8e9345925348 sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c      Wed Aug 29 11:29:27 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c      Wed Aug 29 14:53:46 2018 +0000
@@ -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 @@
        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) {