Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:03:21 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
i915_gem.c i915_irq.c
Log Message:
Use dev->struct_mutex, not drm_global_mutex, for ring->irq_queue.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.27 -r1.1.1.1.2.28 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.1.1.1.2.11 -r1.1.1.1.2.12 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.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/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.27 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.28
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.27 Sun Sep 8 16:01:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Sep 8 16:03:21 2013
@@ -795,7 +795,7 @@ static int i915_wait_irq(struct drm_devi
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
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.12
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.1.1.1.2.11 Sun Sep 8 16:00:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Sun Sep 8 16:03:21 2013
@@ -1197,7 +1197,8 @@ static int __wait_seqno(struct intel_rin
* 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
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.6 Wed Jul 24 04:01:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Sun Sep 8 16:03:21 2013
@@ -355,7 +355,7 @@ static void notify_ring(struct drm_devic
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 @@ static void i915_record_ring_state(struc
#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 @@ void i915_handle_error(struct drm_device
*/
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 @@ static bool i915_hangcheck_ring_idle(str
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",
