Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:43:16 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_usif.c
Log Message:
Use DRM_SPIN_WAKEUP_ONE, not wake_up_interruptible.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.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_usif.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c:1.4 Mon Aug 27 07:39:07 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c Mon Aug 27 07:43:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_usif.c,v 1.4 2018/08/27 07:39:07 riastradh Exp $ */
+/* $NetBSD: nouveau_usif.c,v 1.5 2018/08/27 07:43:16 riastradh Exp $ */
/*
* Copyright 2014 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.4 2018/08/27 07:39:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.5 2018/08/27 07:43:16 riastradh Exp $");
#include "nouveau_drm.h"
#include "nouveau_usif.h"
@@ -117,7 +117,11 @@ usif_notify(const void *header, u32 leng
list_add_tail(&ntfy->p->base.link, &filp->event_list);
filp->event_space -= ntfy->p->e.base.length;
}
+#ifdef __NetBSD__
+ DRM_SPIN_WAKEUP_ONE(&filp->event_wait, &dev->event_lock);
+#else
wake_up_interruptible(&filp->event_wait);
+#endif
spin_unlock_irqrestore(&dev->event_lock, flags);
atomic_set(&ntfy->enabled, 0);
return NVIF_NOTIFY_DROP;
