[PATCH 0/2] drm/i915: Backport vma fixes for 4.10-rc6

[Maarten Lankhorst]

With atomic plane states we are able to track an allocation right from
preparation, during use and through to the final free after being
swapped out for a new plane. We can couple the VMA we pin for the
framebuffer (and its rotation) to this lifetime and avoid all the clumsy
lookups in between.

This is marked for rc6 because it seems the issue is triggerable on
mainline and resulting in an oops.

The backport also requires a preparation patch, which is required because
otherwise the vma is not always populated and then we dereference a null
pointer.

References: https://bugs.freedesktop.org/show_bug.cgi?id=98829

Chris Wilson (1):
  drm/i915: Track pinned vma in intel_plane_state

Maarten Lankhorst (1):
  drm/atomic: Unconditionally call prepare_fb.

 drivers/gpu/drm/drm_atomic_helper.c       |   9 ---
 drivers/gpu/drm/i915/i915_drv.h           |  16 +---
 drivers/gpu/drm/i915/intel_atomic_plane.c |  20 +++++
 drivers/gpu/drm/i915/intel_display.c      | 125 ++++++++++--------------------
 drivers/gpu/drm/i915/intel_drv.h          |   9 ++-
 drivers/gpu/drm/i915/intel_fbc.c          |  52 +++++--------
 drivers/gpu/drm/i915/intel_fbdev.c        |   4 +-
 drivers/gpu/drm/i915/intel_sprite.c       |   8 +-
 8 files changed, 99 insertions(+), 144 deletions(-)

-- 
2.7.4