On Mon, 22 Oct 2012 18:34:05 -0700 Ben Widawsky <ben at bwidawsk.net> wrote: > As a result of some work which I can't yet talk about, it became > obvious that now was the time to kill AGP. As this is actually prep > work for the interesting stuff but the interesting stuff can't be > released yet, I serve it up here for review now. > > Of the 10 patches, only 1 is really interesting as far as review is > concerned (6). > > 1-5 is prep, and things which I could sneak in. > 6 is moving all the necessary bits from agp layer into i915 > 7 is a small fix introduced separately from 6 for bisectability > 8 is removing all the cruft > 9 is a patch from Jesse, rebased (requested by Daniel) > 10 was done for my testing, and also is RFC > > > Ben Widawsky (10): > drm/i915: > http://cgit.freedesktop.org/~bwidawsk/drm-intel/log/?h=kill-agpNo > LLC_MLC for HSW. drm/i915: Add dev to ppgtt drm/i915: introduce > gtt_pte_tdrm/i915: Extract PPGTT pte encoding > drm/i915: move more pte encoding to pte encode > drm/i915: Stop using AGP layer for GEN6+ > drm/i915: Calculate correct stolen size for GEN7+ > drm/i915: Kill off now unused gen6+ AGP code > drm/i915: flush system agent TLBs on SNB > drm/i915: Kill off actually requiring AGP > > drivers/char/agp/intel-agp.h | 91 --------- > drivers/char/agp/intel-gtt.c | 309 > +---------------------------- > drivers/gpu/drm/Kconfig | 2 - > drivers/gpu/drm/i915/i915_dma.c | 16 +- > drivers/gpu/drm/i915/i915_drv.c | 8 + > drivers/gpu/drm/i915/i915_drv.h | 13 +- > drivers/gpu/drm/i915/i915_gem.c | 14 +- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- > drivers/gpu/drm/i915/i915_gem_gtt.c | 308 > ++++++++++++++++++++++++---- > drivers/gpu/drm/i915/i915_reg.h | 10 + > include/drm/intel-gtt.h | 7 +- 11 files changed, > 317 insertions(+), 463 deletions(-) > Daniel, I've pushed the updated branch with all of the reviewed-bys that I have here (and dropped patch 10): http://cgit.freedesktop.org/~bwidawsk/drm-intel/log/?h=kill-agp Assuming nobody has issue with the v2 I've posted of patches 6 and 9, I think it's ready for merge to -testing/-queued. -- Ben Widawsky, Intel Open Source Technology Center