Module Name: src
Committed By: riastradh
Date: Thu Jul 17 17:17:24 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_dp.c
Log Message:
Lock the right lock around the gmbus condvar.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.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/intel_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.5 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Thu Jul 17 17:17:24 2014
@@ -371,12 +371,12 @@ intel_dp_aux_wait_done(struct intel_dp *
#ifdef __NetBSD__
{
int ret;
- spin_lock(&dev_priv->irq_lock);
+ spin_lock(&dev_priv->gmbus_wait_lock);
DRM_SPIN_TIMED_WAIT_UNTIL(ret, &dev_priv->gmbus_wait_queue,
&dev_priv->gmbus_wait_lock, msecs_to_jiffies_timeout(10),
C);
done = ret; /* XXX ugh */
- spin_unlock(&dev_priv->irq_lock);
+ spin_unlock(&dev_priv->gmbus_wait_lock);
}
#else
done = wait_event_timeout(dev_priv->gmbus_wait_queue, C,
