Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:49:05 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gpu_error.c
Log Message:
Lock around use of irq_queue.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
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.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:1.8 Mon Aug 27 07:09:28 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c Mon Aug 27 14:49:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gpu_error.c,v 1.8 2018/08/27 07:09:28 riastradh Exp $ */
+/* $NetBSD: i915_gpu_error.c,v 1.9 2018/08/27 14:49:05 riastradh Exp $ */
/*
* Copyright (c) 2008 Intel Corporation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.8 2018/08/27 07:09:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.9 2018/08/27 14:49:05 riastradh Exp $");
#include <sys/param.h>
@@ -929,8 +929,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
