diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-12 06:53:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-12 06:53:30 +1000 |
| commit | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (patch) | |
| tree | 44440aac4ecaf60c1f789e912618e7783c36be5f /drivers/gpu/drm/i915/intel_i2c.c | |
| parent | 2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232 (diff) | |
| parent | 0bbca274a31c2366414d8d3f95e03d1c4674d93f (diff) | |
Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel into drm-next
Two i915 regression fixes.
* tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel:
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; |