Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:37:07 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_fence.c
Log Message:
Don't abuse kref abstraction.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_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/nouveau/nouveau_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.11 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.11 Mon Aug 27 07:36:58 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c Mon Aug 27 07:37:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_fence.c,v 1.11 2018/08/27 07:36:58 riastradh Exp $ */
+/* $NetBSD: nouveau_fence.c,v 1.12 2018/08/27 07:37:07 riastradh Exp $ */
/*
* Copyright (C) 2007 Ben Skeggs.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.11 2018/08/27 07:36:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.12 2018/08/27 07:37:07 riastradh Exp $");
#include <drm/drmP.h>
@@ -557,7 +557,8 @@ static bool nouveau_fence_no_signaling(s
* caller should have a reference on the fence,
* else fence could get freed here
*/
- WARN_ON(atomic_read(&fence->base.refcount.refcount) <= 1);
+ WARN_ON(!kref_referenced_p(&fence->base.refcount));
+ WARN_ON(kref_exclusive_p(&fence->base.refcount));
/*
* This needs uevents to work correctly, but fence_add_callback relies on
