summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kurtz2012-04-13 13:47:54 +0200
committerDaniel Vetter2012-04-13 15:03:00 +0200
commit56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4 (patch)
tree457cdcf915ddeeb7a5666dfd7d3d3c5d2ce458a5
parentdrm/i915/intel_i2c: handle zero-length reads (diff)
downloadkernel-qcow2-linux-56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4.tar.gz
kernel-qcow2-linux-56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4.tar.xz
kernel-qcow2-linux-56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4.zip
drm/i915/intel_i2c: reduce verbosity of some messages
Some of these messages can be hit when userspace tries to probe the i2c with nothing connected or if the driver code tries to do the same. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48248 Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_i2c.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index e24916042550..e04255edc801 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -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;
}
@@ -399,7 +399,8 @@ clear_err:
*/
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
@@ -409,7 +410,7 @@ clear_err:
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);