Sliced and diced the mega patch into tiny little pieces on the request of Daniel. Overall, I think it's a big improvement (TBD if it was worth the time and effort though) Here I also drop vma->active and leave obj->active; also a request from Daniel. Finally, I moved the virtual function stuff to the end of the series. I think Daniel requested that one too, but I can't remember. Odds are with all this rebasing, I introduced new bugs. I've been a bit too preoccupied to check each patch thoroughly - but the end result is right, and works. Ben Widawsky (29): drm/i915: Create an init vm drm/i915: Rework drop caches for checkpatch drm/i915: Make proper functions for VMs drm/i915: Use bound list for inactive shrink drm/i915: Add VM to pin drm/i915: Use ggtt_vm to save some typing drm/i915: Update describe_obj drm/i915: Rework __i915_gem_shrink drm/i915: thread address space through execbuf drm/i915: make caching operate on all address spaces drm/i915: BUG_ON put_pages later drm/i915: make reset&hangcheck code VM aware drm/i915: clear domains for all objects on reset drm/i915: Restore PDEs on gtt restore drm/i915: Improve VMA comments drm/i915: Cleanup more of VMA in destroy drm/i915: plumb VM into bind/unbind code drm/i915: Use new bind/unbind in eviction code drm/i915: turn bound_ggtt checks to bound_any drm/i915: Fix up map and fenceable for VMA drm/i915: mm_list is per VMA drm/i915: Update error capture for VMs drm/i915: Add vma to list at creation drm/i915: create vmas at execbuf drm/i915: Convert execbuf code to use vmas drm/i915: Convert active API to VMA drm/i915: Add bind/unbind object functions to VM drm/i915: Use the new vm [un]bind functions drm/i915: eliminate vm->insert_entries() drivers/gpu/drm/i915/i915_debugfs.c | 68 +++-- drivers/gpu/drm/i915/i915_dma.c | 4 - drivers/gpu/drm/i915/i915_drv.h | 185 +++++++------ drivers/gpu/drm/i915/i915_gem.c | 420 ++++++++++++++++++++--------- drivers/gpu/drm/i915/i915_gem_context.c | 17 +- drivers/gpu/drm/i915/i915_gem_evict.c | 78 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 360 ++++++++++++++----------- drivers/gpu/drm/i915/i915_gem_gtt.c | 138 ++++++---- drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 9 +- drivers/gpu/drm/i915/i915_gpu_error.c | 111 +++++--- drivers/gpu/drm/i915/i915_trace.h | 37 +-- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- 15 files changed, 904 insertions(+), 545 deletions(-) -- 1.8.3.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx