Module Name: src
Committed By: riastradh
Date: Fri Feb 27 04:35:02 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_i2c.c
Log Message:
Make gmbus_wait_hw_status consistently use 50ms timeout like Linux.
Apparently I changed this to a 1-tick timeout. No clue why.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.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_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.5 Fri Feb 27 04:29:27 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Fri Feb 27 04:35:02 2015
@@ -289,17 +289,18 @@ gmbus_wait_hw_status(struct drm_i915_pri
#ifdef __NetBSD__
spin_lock(&dev_priv->gmbus_wait_lock);
if (cold) {
- unsigned timo = 1000;
+ unsigned timo = 50;
+
while (gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset),
!ISSET(gmbus2, (GMBUS_SATOER | gmbus2_status))) {
if (timo-- == 0)
break;
- DELAY(100);
+ DELAY(1000);
}
} else {
int ret;
DRM_SPIN_TIMED_WAIT_UNTIL(ret, &dev_priv->gmbus_wait_queue,
- &dev_priv->gmbus_wait_lock, 1,
+ &dev_priv->gmbus_wait_lock, mstohz(50),
(gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset),
!ISSET(gmbus2, (GMBUS_SATOER | gmbus2_status))));
}
