[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Use dev->struct...

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

details:   https://anonhg.NetBSD.org/src/rev/f83c64ae4929
branches:  riastradh-drm2
changeset: 788543:f83c64ae4929
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 16:03:21 2013 +0000

description:
Use dev->struct_mutex, not drm_global_mutex, for ring->irq_queue.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |   2 +-
 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |   3 ++-
 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c |  19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 224bc8242cae -r f83c64ae4929 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Sep 08 16:02:50 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sun Sep 08 16:03:21 2013 +0000
@@ -795,7 +795,7 @@
 
        if (ring->irq_get(ring)) {
 #ifdef __NetBSD__
-               DRM_TIMED_WAIT_UNTIL(ret, &ring->irq_queue, &drm_global_mutex,
+               DRM_TIMED_WAIT_UNTIL(ret, &ring->irq_queue, &dev->struct_mutex,
                    3 * DRM_HZ,
                    READ_BREADCRUMB(dev_priv) >= irq_nr);
 #else
diff -r 224bc8242cae -r f83c64ae4929 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 16:02:50 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Sep 08 16:03:21 2013 +0000
@@ -1197,7 +1197,8 @@
                 * XXX This wait is always interruptible; we should
                 * heed the flag `interruptible'.
                 */
-               DRM_TIMED_WAIT_UNTIL(end, &ring->irq_queue, &drm_global_mutex,
+               DRM_TIMED_WAIT_UNTIL(end, &ring->irq_queue,
+                   &ring->dev->struct_mutex,
                    timeout_jiffies,
                    EXIT_COND);
 #else
diff -r 224bc8242cae -r f83c64ae4929 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Sun Sep 08 16:02:50 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Sun Sep 08 16:03:21 2013 +0000
@@ -355,7 +355,7 @@
        trace_i915_gem_request_complete(ring, ring->get_seqno(ring, false));
 
 #ifdef __NetBSD__
-       DRM_WAKEUP_ALL(&ring->irq_queue, &drm_global_mutex);
+       DRM_WAKEUP_ALL(&ring->irq_queue, &dev->struct_mutex);
 #else
        wake_up_all(&ring->irq_queue);
 #endif
@@ -1168,7 +1168,7 @@
 
 #ifdef __NetBSD__
        error->waiting[ring->id] = DRM_WAITERS_P(&ring->irq_queue,
-           &drm_global_mutex);
+           &dev->struct_mutex);
 #else
        error->waiting[ring->id] = waitqueue_active(&ring->irq_queue);
 #endif
@@ -1487,7 +1487,7 @@
                 */
                for_each_ring(ring, dev_priv, i)
 #ifdef __NetBSD__
-                       DRM_WAKEUP_ALL(&ring->irq_queue, &drm_global_mutex);
+                       DRM_WAKEUP_ALL(&ring->irq_queue, &dev->struct_mutex);
 #else
                        wake_up_all(&ring->irq_queue);
 #endif
@@ -1696,12 +1696,21 @@
                              ring_last_seqno(ring))) {
                /* Issue a wake-up to catch stuck h/w. */
 #ifdef __NetBSD__
-               if (DRM_WAITERS_P(&ring->irq_queue, &drm_global_mutex)) {
+               /*
+                * XXX mutex_lock here is a load of bollocks, but I'm
+                * not sure what invariants the irq_queue is actually
+                * relying on.
+                */
+               mutex_lock(&ring->dev->struct_mutex);
+               if (DRM_WAITERS_P(&ring->irq_queue,
+                       &ring->dev->struct_mutex)) {
                        DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
                                  ring->name);
-                       DRM_WAKEUP_ALL(&ring->irq_queue, &drm_global_mutex);
+                       DRM_WAKEUP_ALL(&ring->irq_queue,
+                           &ring->dev->struct_mutex);
                        *err = true;
                }
+               mutex_unlock(&ring->dev->struct_mutex);
 #else
                if (waitqueue_active(&ring->irq_queue)) {
                        DRM_ERROR("Hangcheck timer elapsed... %s idle\n",