Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel
authorDave Airlie <airlied@gmail.com>
Sat, 5 Jul 2014 21:49:59 +0000 (07:49 +1000)
committerDave Airlie <airlied@gmail.com>
Sat, 5 Jul 2014 21:49:59 +0000 (07:49 +1000)
commitdfd7aecfd6d227831d77719379d4c7137f444fee
tree9ddf609cb0ac13555dce0930fe93c6e951352e0e
parent80e6e6b1764023ac1fba41e22a8503245b0fa573
parent5549d25f642a7e6cfb8744d0031a9da404f696d6
Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel

Fixes for 3.16-rc3; most importantly Jesse brings back VGA he took away
on a bunch of machines. Also a vblank fix for BDW and a power workaround
fix for VLV.

* tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW
drivers/gpu/drm/i915/intel_pm.c