Merge tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git...
authorDave Airlie <airlied@redhat.com>
Thu, 2 Feb 2017 23:09:36 +0000 (09:09 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Feb 2017 23:09:36 +0000 (09:09 +1000)
commita20def95401112358bcc90242f252a96084a2d47
treeec6ed90dbf0a2537a57ed5c29b3fd01da8295061
parent52b679f60e2a68af88411f12318675a2424a0e14
parente8fe4f4b2b7b93048729538321c681c0cff33b39
Merge tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

here's Maarten's backport of the vma fixes for v4.10.

* tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Track pinned vma in intel_plane_state
  drm/atomic: Unconditionally call prepare_fb.