On Thu, Jun 11, 2015 at 09:05:38PM +0300, Mika Kuoppala wrote: > Michel Thierry <michel.thierry@xxxxxxxxx> writes: > > > After Mika's ppgtt cleanup series, all the other free functions have > > drm_device as the first parameter, except this one. > > > > No functional changes. > > > > Signed-off-by: Michel Thierry <michel.thierry@xxxxxxxxx> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> First two patches merged, thanks. -Daniel > > > --- > > drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > > index 8f79125..8314e59 100644 > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > > @@ -766,7 +766,8 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, > > kunmap_px(ppgtt, pt_vaddr); > > } > > > > -static void gen8_free_page_tables(struct i915_page_directory *pd, struct drm_device *dev) > > +static void gen8_free_page_tables(struct drm_device *dev, > > + struct i915_page_directory *pd) > > { > > int i; > > > > @@ -792,7 +793,8 @@ static void gen8_ppgtt_cleanup(struct i915_address_space *vm) > > if (WARN_ON(!ppgtt->pdp.page_directory[i])) > > continue; > > > > - gen8_free_page_tables(ppgtt->pdp.page_directory[i], ppgtt->base.dev); > > + gen8_free_page_tables(ppgtt->base.dev, > > + ppgtt->pdp.page_directory[i]); > > free_pd(ppgtt->base.dev, ppgtt->pdp.page_directory[i]); > > } > > > > -- > > 2.4.0 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx