UPSTREAM: drm/i915/intel_i2c: reduce verbosity of some messages
authorDaniel Kurtz <djkurtz@chromium.org>
Fri, 13 Apr 2012 11:47:54 +0000 (19:47 +0800)
committerGrant Grundler <grundler@google.com>
Thu, 24 May 2012 22:13:20 +0000 (15:13 -0700)
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>
(cherry picked from commit 56fa6d6ff76c7700f8dd131bee9ffa6c3c06dcd4)

Change-Id: Id8cf2e57682cba499f9d755f06b6c920c5144109
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
drivers/gpu/drm/i915/intel_i2c.c

index e249160..e04255e 100644 (file)
@@ -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);