Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 19 Jul 2016 06:09:20 +0000 (16:09 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 19 Jul 2016 06:09:20 +0000 (16:09 +1000)
commit84ade45e056f2e292f07c54446c176d0112d9574
tree17031e0393468b84de208b779033013769131765
parent47ef4ad2684d380dd6d596140fb79395115c3950
parented2eebbd61af8d378ca39ad7aef7017f29eed6f3
Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Two more regression fixes for 4.7.

* tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: add missing condition for committing planes on crtc
  drm/i915: Treat eDP as always connected, again