Module Name:    src
Committed By:   martin
Date:           Sat Apr  1 15:40:49 UTC 2023

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-8]: i915_gpu_error.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1813):

        sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c: revision 1.9

Lock around use of irq_queue.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.10.1 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.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_gpu_error.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.4.10.1
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.4	Thu May 12 14:50:39 2016
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c	Sat Apr  1 15:40:49 2023
@@ -824,8 +824,10 @@ static void i915_record_ring_state(struc
 	}
 
 #ifdef __NetBSD__
+	spin_lock(&dev_priv->irq_lock);
 	ering->waiting = DRM_SPIN_WAITERS_P(&ring->irq_queue,
 	    &dev_priv->irq_lock);
+	spin_unlock(&dev_priv->irq_lock);
 #else
 	ering->waiting = waitqueue_active(&ring->irq_queue);
 #endif

Reply via email to