Merge tag 'drm-intel-fixes-2014-09-10' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 11 Sep 2014 10:17:10 +0000 (20:17 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 11 Sep 2014 10:17:10 +0000 (20:17 +1000)
commit3afdd8a0e26dfa8c4c67bef56d89fe53ed425f3d
treed9810ad592b03b0d8751491908e9969cec6790e5
parent69e672fded796818a7e3216eb968e4e01a5555b4
parent7a98948f3b536ca9a077e84966ddc0e9f53726df
Merge tag 'drm-intel-fixes-2014-09-10' of git://anongit.freedesktop.org/drm-intel into drm-fixes

more fixes for 3.17, almost all Cc: stable material.

* tag 'drm-intel-fixes-2014-09-10' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Wait for vblank before enabling the TV encoder
  drm/i915: Evict CS TLBs between batches
  drm/i915: Fix irq enable tracking in driver load
  drm/i915: Fix EIO/wedged handling in gem fault handler
  drm/i915: Prevent recursive deadlock on releasing a busy userptr