Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307155
b: refs/heads/master
c: 56fa6d6
h: refs/heads/master
i:
  307153: 606e5e8
  307151: 55858c5
v: v3
  • Loading branch information
Daniel Kurtz authored and Daniel Vetter committed Apr 13, 2012
1 parent 3d59179 commit f342869
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79985eee842ef146ed6307a29fdc2fa008036421
refs/heads/master: 56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4
7 changes: 4 additions & 3 deletions trunk/drivers/gpu/drm/i915/intel_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ gmbus_xfer(struct i2c_adapter *adapter,
*/
if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,
10)) {
DRM_INFO("GMBUS [%s] timed out waiting for idle\n",
DRM_DEBUG_KMS("GMBUS [%s] timed out waiting for idle\n",
adapter->name);
ret = -ETIMEDOUT;
}
Expand All @@ -399,7 +399,8 @@ gmbus_xfer(struct i2c_adapter *adapter,
*/
if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,
10))
DRM_INFO("GMBUS [%s] timed out after NAK\n", adapter->name);
DRM_DEBUG_KMS("GMBUS [%s] timed out after NAK\n",
adapter->name);

/* Toggle the Software Clear Interrupt bit. This has the effect
* of resetting the GMBUS controller and so clearing the
Expand All @@ -409,7 +410,7 @@ gmbus_xfer(struct i2c_adapter *adapter,
I915_WRITE(GMBUS1 + reg_offset, 0);
I915_WRITE(GMBUS0 + reg_offset, 0);

DRM_DEBUG_DRIVER("GMBUS [%s] NAK for addr: %04x %c(%d)\n",
DRM_DEBUG_KMS("GMBUS [%s] NAK for addr: %04x %c(%d)\n",
adapter->name, msgs[i].addr,
(msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);

Expand Down

0 comments on commit f342869

Please sign in to comment.