Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 11 Mar 2016 20:53:30 +0000 (06:53 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 11 Mar 2016 20:53:30 +0000 (06:53 +1000)
commit125234dc8b1cc862f52d8bd5b37c36cc59b2cb86
tree44440aac4ecaf60c1f789e912618e7783c36be5f
parent2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232
parent0bbca274a31c2366414d8d3f95e03d1c4674d93f
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