On Thu, Feb 13, 2014 at 01:47:57PM +0200, Ville Syrjälä wrote: > On Wed, Feb 12, 2014 at 02:28:43PM -0800, Ben Widawsky wrote: > > Rebased series from what I submitted a while ago: > > http://lists.freedesktop.org/archives/intel-gfx/2013-December/037815.html > > > > It was mostly a clean rebase, but there were a couple of major conflicts which > > I think I cleaned up properly, but extra eyes would be good. > > One thing I noticed while staring at the ppgtt code recently is that > gen6 ppgtt cleanup kfrees the ppgtt struct, but gen8 code doesn't. > At that time it looked like the correct fix was moving the kfree() > out from the gen6 code into some common place. The reason being > that the gen8 code called the cleanup function during error handling > in the init paths. But I'm not sure if you've changed that with this > series. A quick scan of these patches tells me the leak is still > there at least. > Yeah, you're right, thanks for spotting it. I put the fix at the beginning of the series. Fortunately BDW full PPGTT isn't turned on yet, so we only leak 1 per module reload. > > > > As before, the last two are optional. > > > > Ben Widawsky (9): > > drm/i915/bdw: Split up PPGTT cleanup > > drm/i915/bdw: Reorganize PPGTT init > > drm/i915/bdw: Split ppgtt initialization up > > drm/i915: Make clear/insert vfuncs args absolute > > drm/i915/bdw: Reorganize PT allocations > > Revert "drm/i915/bdw: Limit GTT to 2GB" > > drm/i915: Update i915_gem_gtt.c copyright > > drm/i915: Split GEN6 PPGTT cleanup > > drm/i915: Split GEN6 PPGTT initialization up > > > > drivers/gpu/drm/i915/i915_drv.h | 13 +- > > drivers/gpu/drm/i915/i915_gem_gtt.c | 621 +++++++++++++++++++++++++----------- > > 2 files changed, 438 insertions(+), 196 deletions(-) > > > > -- > > 1.8.5.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel OTC -- Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx