From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Feb 2017 23:09:36 +0000 (+1000)
Subject: Merge tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a20def95401112358bcc90242f252a96084a2d47;p=linux-beck.git

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

a20def95401112358bcc90242f252a96084a2d47