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)
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.


Trivial merge