[src/riastradh-drm2]: src/sys/external/bsd/drm2/include/drm Implement drm wai...

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

details:   https://anonhg.NetBSD.org/src/rev/182edd042239
branches:  riastradh-drm2
changeset: 788011:182edd042239
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 01:49:31 2013 +0000

description:
Implement drm waitqueues with condvars.  Include in drm_os_netbsd.h.

diffstat:

 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h   |   4 +-
 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h |  67 +++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletions(-)

diffs (87 lines):

diff -r ea118b3a7c60 -r 182edd042239 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Wed Jul 24 01:49:07 2013 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Wed Jul 24 01:49:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_os_netbsd.h,v 1.1.2.1 2013/07/24 00:51:31 riastradh Exp $  */
+/*     $NetBSD: drm_os_netbsd.h,v 1.1.2.2 2013/07/24 01:49:31 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,4 +36,6 @@
 #include "opt_drm.h"
 #endif
 
+#include <drm/drm_wait_netbsd.h>
+
 #endif  /* _DRM_DRM_OS_NETBSD_H_ */
diff -r ea118b3a7c60 -r 182edd042239 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h       Wed Jul 24 01:49:31 2013 +0000
@@ -0,0 +1,67 @@
+/*     $NetBSD: drm_wait_netbsd.h,v 1.1.2.1 2013/07/24 01:49:31 riastradh Exp $        */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DRM_DRM_WAIT_NETBSD_H_
+#define _DRM_DRM_WAIT_NETBSD_H_
+
+#include <sys/condvar.h>
+#include <sys/mutex.h>
+#include <sys/systm.h>
+
+typedef kcondvar_t drm_waitqueue_t;
+typedef kmutex_t drm_interlock_t;
+
+static inline void
+DRM_INIT_WAITQUEUE(drm_waitqueue_t *q, const char *name)
+{
+
+       cv_init(q, name);
+}
+
+static inline void
+DRM_WAKEUP(drm_waitqueue_t *q, drm_interlock_t *interlock)
+{
+
+       KASSERT(mutex_owned(interlock));
+       cv_broadcast(q);
+}
+
+#define        DRM_WAIT_ON(RET, Q, INTERLOCK, TICKS, CONDITION) do             \
+{                                                                      \
+       KASSERT(mutex_owned((INTERLOCK)));                              \
+       while (!(CONDITION)) {                                          \
+               (RET) = cv_timedwait_sig((Q), (INTERLOCK), (TICKS));    \
+               if (RET)                                                \
+                       break;                                          \
+       }                                                               \
+} while (0)
+
+#endif  /* _DRM_DRM_WAIT_NETBSD_H_ */