Simplifies allocations by using a flexible array member in this struct. No need to free separately.
Signed-off-by: Rosen Penev <[email protected]> --- drivers/gpu/drm/i915/gt/intel_gtt.h | 2 +- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h index f6f223090760..49b2d2d24fd8 100644 --- a/drivers/gpu/drm/i915/gt/intel_gtt.h +++ b/drivers/gpu/drm/i915/gt/intel_gtt.h @@ -187,7 +187,7 @@ struct i915_page_table { struct i915_page_directory { struct i915_page_table pt; spinlock_t lock; - void **entry; + void *entry[]; }; #define __px_choose_expr(x, type, expr, other) \ diff --git a/drivers/gpu/drm/i915/gt/intel_ppgtt.c b/drivers/gpu/drm/i915/gt/intel_ppgtt.c index 72d8473a448b..20cc59a005c9 100644 --- a/drivers/gpu/drm/i915/gt/intel_ppgtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ppgtt.c @@ -36,16 +36,10 @@ struct i915_page_directory *__alloc_pd(int count) { struct i915_page_directory *pd; - pd = kzalloc_obj(*pd, I915_GFP_ALLOW_FAIL); + pd = kzalloc_flex(*pd, entry, count, I915_GFP_ALLOW_FAIL); if (unlikely(!pd)) return NULL; - pd->entry = kzalloc_objs(*pd->entry, count, I915_GFP_ALLOW_FAIL); - if (unlikely(!pd->entry)) { - kfree(pd); - return NULL; - } - spin_lock_init(&pd->lock); return pd; } @@ -60,7 +54,6 @@ struct i915_page_directory *alloc_pd(struct i915_address_space *vm) pd->pt.base = vm->alloc_pt_dma(vm, I915_GTT_PAGE_SIZE_4K); if (IS_ERR(pd->pt.base)) { - kfree(pd->entry); kfree(pd); return ERR_PTR(-ENOMEM); } @@ -72,12 +65,6 @@ void free_px(struct i915_address_space *vm, struct i915_page_table *pt, int lvl) { BUILD_BUG_ON(offsetof(struct i915_page_directory, pt)); - if (lvl) { - struct i915_page_directory *pd = - container_of(pt, typeof(*pd), pt); - kfree(pd->entry); - } - if (pt->base) i915_gem_object_put(pt->base); -- 2.54.0
