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)
commit218212722f681fb31b24749776984fd809eec2f2
treeae1a9dbc0f9c0242c6cdb2f7bccca03091be6484
parentdcb99fd9b08cfe1afe426af4d8d3cbc429190f15
parent5c673b60a9b3b23486f4eda75c72e91d31d26a2b
Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes

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