Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 03:06:17 +0000 (13:06 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 03:06:17 +0000 (13:06 +1000)
Two 3.14 specific fixes, two cc: stable.

* tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Don't enable display error interrupts from the start
  drm/i915: Fix scanline counter fixup on BDW
  drm/i915: Add a workaround for HSW scanline counter weirdness
  drm/i915: Fix PSR programming


Trivial merge