On Thu, Sep 26, 2013 at 10:31:26PM +0200, Daniel Vetter wrote: > Hi all, > > So the first part reworks the gtt ->bind/unbind stuff so that I can rebase the > -internal try without going berserk. 2nd patch is a bit of fluff removal, next > for do reorder i915_gem_gtt.c a bit to make more sense (I've been confused every > 2nd time I've had to rebase -internal and there was a conflict in there, call me > stupid ...). Last one is my ducttape for the BUG_ON Ville hit. > > Cheers, Daniel > > Daniel Vetter (7): > drm/i915: resurrect ->insert_entries/->clear_range gtt interfaces > drm/i915: don't allow ppgtt enabling to fail anymore > drm/i915/gtt: group sg setup/teardown functions to the end > drm/i915/gtt: move restore_gtt_mappings to the bottom > drm/i915/gtt: group legacy global gtt code together > drm/i915/gtt: move generic setup code all to the bottom > drm/i915: we can't call move_to_active before intel_ring_begin > > drivers/gpu/drm/i915/i915_dma.c | 4 +- > drivers/gpu/drm/i915/i915_drv.c | 4 +- > drivers/gpu/drm/i915/i915_drv.h | 6 +- > drivers/gpu/drm/i915/i915_gem.c | 8 +- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 40 +- > drivers/gpu/drm/i915/i915_gem_gtt.c | 683 ++++++++++++++--------------- > 6 files changed, 357 insertions(+), 388 deletions(-) > At this point it just seems like you're intentionally making it harder for me to ever merge PPGTT. -- Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
