Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 5 Dec 2016 08:52:17 +0000 (09:52 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 5 Dec 2016 08:52:17 +0000 (09:52 +0100)
commit93cd6fa6806cb3455e8231578840afb031606352
tree042f13cde2701b880d512c5cd6b263b0197cc39f
parentce6612d6844701a5b5a162f201103240c07abd9e
parentf03ee46be9401e3434f52bb15e92d1e640f76438
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Resync, and we need all the fancy new drm_mm stuff to implement more
efficient evict algorithms for softpin.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fbdev.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sprite.c