Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 20 Mar 2015 07:32:21 +0000 (17:32 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 20 Mar 2015 07:32:21 +0000 (17:32 +1000)
commit8265d4486d5c2448a1c645fdc20d4e62873d9c3d
tree1e2fb500924320cd1cd5c39ce914be70d2b3e8ca
parentf42e2c2429c0a76d99565e20d70d4fbf21c97498
parent7f0801e566cc78315e5dc383bf3c3b5b5b436048
Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Backporting a couple of plane related fixes from drm-next to v4.0.

* tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Make sure the primary plane is enabled before reading out the fb state
  drm/i915: Ensure plane->state->fb stays in sync with plane->fb