[Intel-gfx] [PATCH] drm/i915/gtt: remove px_page

[Mika Kuoppala]

Matthew Auld <matthew.auld at intel.com> writes:

> Entries will either be pointing to scratch or real PD, making the
> px_page(pd) check pointless. Also since there are no other users of
> px_page, just remove it.
>

Yup. Callsites return enomem and free the struct so
we should not leak any partially setup structs.

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michel Thierry <michel.thierry at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ---
>  drivers/gpu/drm/i915/i915_gem_gtt.h | 1 -
>  2 files changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 87219870d559..4137af4bd8f5 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -1251,9 +1251,6 @@ static void gen8_free_page_tables(struct i915_address_space *vm,
>  {
>  	int i;
>  
> -	if (!px_page(pd))
> -		return;
> -
>  	for (i = 0; i < I915_PDES; i++) {
>  		if (pd->page_table[i] != vm->scratch_pt)
>  			free_pt(vm, pd->page_table[i]);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index ce945bf78a89..dd161c187a68 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -229,7 +229,6 @@ struct i915_page_dma {
>  };
>  
>  #define px_base(px) (&(px)->base)
> -#define px_page(px) (px_base(px)->page)
>  #define px_dma(px) (px_base(px)->daddr)
>  
>  struct i915_page_table {
> -- 
> 2.17.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx