[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Lock the right lock arou...

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

details:   https://anonhg.NetBSD.org/src/rev/7464d5cd4e71
branches:  trunk
changeset: 797435:7464d5cd4e71
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jul 17 17:17:24 2014 +0000

description:
Lock the right lock around the gmbus condvar.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r acea04f1f9f0 -r 7464d5cd4e71 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Thu Jul 17 17:11:12 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c    Thu Jul 17 17:17:24 2014 +0000
@@ -371,12 +371,12 @@
 #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,