Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fa6d6f authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Daniel Vetter
Browse files

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: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 79985eee

drivers/gpu/drm/i915/intel_i2c.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -383,7 +383,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
	 */

	 */

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,

		     10)) {

		     10)) {

		DRM_INFO("GMBUS [%s] timed out waiting for idle\n",

		DRM_DEBUG_KMS("GMBUS [%s] timed out waiting for idle\n",

			 adapter->name);

			 adapter->name);

		ret = -ETIMEDOUT;

		ret = -ETIMEDOUT;

	}

	}
@@ -399,7 +399,8 @@ gmbus_xfer(struct i2c_adapter *adapter, 
	 */

	 */

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,

	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0,

		     10))

		     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

	/* Toggle the Software Clear Interrupt bit. This has the effect

	 * of resetting the GMBUS controller and so clearing the

	 * of resetting the GMBUS controller and so clearing the
@@ -409,7 +410,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
	I915_WRITE(GMBUS1 + reg_offset, 0);

	I915_WRITE(GMBUS1 + reg_offset, 0);

	I915_WRITE(GMBUS0 + 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,

			 adapter->name, msgs[i].addr,

			 (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);

			 (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);