[src/riastradh-drm2]: src/sys/external/bsd/drm2/include/drm Tweak drm waitque...

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

details:   https://anonhg.NetBSD.org/src/rev/5a1a1b978f76
branches:  riastradh-drm2
changeset: 788061:5a1a1b978f76
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:03:16 2013 +0000

description:
Tweak drm waitqueue compatibility interface.

Use (Linux) struct mutex for drm_interlock_t, and split DRM_WAKEUP
into DRM_WAKEUP_ONE (cv_signal) and DRM_WAKEUP_ALL (cv_broadcast).

diffstat:

 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h |  22 ++++++++++++++------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r a2933346d125 -r 5a1a1b978f76 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h       Wed Jul 24 02:03:00 2013 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h       Wed Jul 24 02:03:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_wait_netbsd.h,v 1.1.2.1 2013/07/24 01:49:31 riastradh Exp $        */
+/*     $NetBSD: drm_wait_netbsd.h,v 1.1.2.2 2013/07/24 02:03:16 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,29 +36,37 @@
 #include <sys/mutex.h>
 #include <sys/systm.h>
 
+#include <linux/mutex.h>
+
 typedef kcondvar_t drm_waitqueue_t;
-typedef kmutex_t drm_interlock_t;
+typedef struct mutex drm_interlock_t; /* XXX urk */
 
 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)
+DRM_WAKEUP_ONE(drm_waitqueue_t *q, drm_interlock_t *interlock)
 {
+       KASSERT(mutex_owned(&interlock->mtx_lock));
+       cv_signal(q);
+}
 
-       KASSERT(mutex_owned(interlock));
+static inline void
+DRM_WAKEUP_ALL(drm_waitqueue_t *q, drm_interlock_t *interlock)
+{
+       KASSERT(mutex_owned(&interlock->mtx_lock));
        cv_broadcast(q);
 }
 
 #define        DRM_WAIT_ON(RET, Q, INTERLOCK, TICKS, CONDITION) do             \
 {                                                                      \
-       KASSERT(mutex_owned((INTERLOCK)));                              \
+       KASSERT(mutex_owned(&(INTERLOCK)->mtx_lock));                   \
        while (!(CONDITION)) {                                          \
-               (RET) = cv_timedwait_sig((Q), (INTERLOCK), (TICKS));    \
+               (RET) = cv_timedwait_sig((Q), &(INTERLOCK)->mtx_lock,   \
+                   (TICKS));                                           \
                if (RET)                                                \
                        break;                                          \
        }                                                               \