diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-12 03:19:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-12 03:19:23 +0300 |
| commit | 3ab0a0f91cca6a9988ef1544176cd7f2106ec722 (patch) | |
| tree | f118b15a42d82901bac0ef678a67dd84e79a622e /drivers/gpu/drm/i915/intel_i2c.c | |
| parent | 7640131032db9118a78af715ac77ba2debeeb17c (diff) | |
| parent | 0bbca274a31c2366414d8d3f95e03d1c4674d93f (diff) | |
| download | linux-3ab0a0f91cca6a9988ef1544176cd7f2106ec722.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm/i915 fixes from Dave Airlie:
"Just two i915 regression fixes, that should be it from me"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Actually retry with bit-banging after GMBUS timeout
drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW
Diffstat (limited to 'drivers/gpu/drm/i915/intel_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index deb8282c26d8..52fbe530fc9e 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -664,6 +664,12 @@ int intel_setup_gmbus(struct drm_device *dev) bus->adapter.algo = &gmbus_algorithm; + /* + * We wish to retry with bit banging + * after a timed out GMBUS attempt. + */ + bus->adapter.retries = 1; + /* By default use a conservative clock rate */ bus->reg0 = pin | GMBUS_RATE_100KHZ; |