drm/i915: Don't try indexed reads to alternate slave addresses
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 23 Nov 2017 19:41:56 +0000 (21:41 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 24 Nov 2017 14:39:08 +0000 (16:39 +0200)
We can only specify the one slave address to indexed reads/writes.
Make sure the messages we check are destined to the same slave
address before deciding to do an indexed transfer.

Cc: stable@vger.kernel.org
Cc: Daniel Kurtz <djkurtz@chromium.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <seanpaul@chromium.org>
Fixes: 56f9eac05489 ("drm/i915/intel_i2c: use INDEX cycles for i2c read transactions")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171123194157.25367-2-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_i2c.c

index eb5827110d8ffca08cf6b46e6671265a43f40307..8affd47b98b814cfdcedbb511ebe47d5d90c9fbe 100644 (file)
@@ -438,6 +438,7 @@ static bool
 gmbus_is_index_read(struct i2c_msg *msgs, int i, int num)
 {
        return (i + 1 < num &&
+               msgs[i].addr == msgs[i + 1].addr &&
                !(msgs[i].flags & I2C_M_RD) && msgs[i].len <= 2 &&
                (msgs[i + 1].flags & I2C_M_RD));
 }