Rebased on a nightly branch which had some decent rebase conflicts resolved for Daniel. Rodrigo's reviewed-by applied, and a few minor fixes here and there. Needs some testing on pre-GEN6 platforms. Ben Widawsky (13): drm/i915: Kill gtt_end drm/i915: Mappable_end can't ever be > end drm/i915: Remove gtt_mappable_total drm/i915: Create a gtt structure drm/i915: Remove use on gma_bus_addr on gen6+ drm/i915: Remove use of gtt_mappable_entries drm/i915: Stop using gtt_total_entries drm/i915: Move stolen_size to the new struct agp/intel: decouple more of the agp-i915 sharing drm/i915: Needs_dmar, not drm/i915: Cut out the infamous ILK w/a from AGP layer drm/i915: Remove scratch page from shared drm/i915: Finally kill off struct intel_gtt drivers/char/agp/intel-gtt.c | 88 ++++++--------- drivers/gpu/drm/i915/i915_debugfs.c | 3 +- drivers/gpu/drm/i915/i915_dma.c | 29 +++-- drivers/gpu/drm/i915/i915_drv.h | 39 +++++-- drivers/gpu/drm/i915/i915_gem.c | 16 +-- drivers/gpu/drm/i915/i915_gem_evict.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 174 ++++++++++++++--------------- drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_fb.c | 5 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- include/drm/intel-gtt.h | 19 ---- 16 files changed, 183 insertions(+), 216 deletions(-) -- 1.8.1.1
