[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Fix double-reference ...

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

details:   https://anonhg.NetBSD.org/src/rev/f5210d7b977c
branches:  trunk
changeset: 835109:f5210d7b977c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:36:58 2018 +0000

description:
Fix double-reference across RCU barrier.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8bbefe01bd68 -r f5210d7b977c sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c    Mon Aug 27 07:36:48 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c    Mon Aug 27 07:36:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_fence.c,v 1.10 2018/08/27 04:58:24 riastradh Exp $     */
+/*     $NetBSD: nouveau_fence.c,v 1.11 2018/08/27 07:36:58 riastradh Exp $     */
 
 /*
  * Copyright (C) 2007 Ben Skeggs.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.10 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.11 2018/08/27 07:36:58 riastradh Exp $");
 
 #include <drm/drmP.h>
 
@@ -164,7 +164,7 @@
 
                fence = list_entry(fctx->pending.next, typeof(*fence), head);
                chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock));
-               if (nouveau_fence_update(fence->channel, fctx))
+               if (nouveau_fence_update(chan, fctx))
                        ret = NVIF_NOTIFY_DROP;
        }
        spin_unlock_irqrestore(&fctx->lock, flags);