Re: [PATCH 18/21] drm/i915/gtt: Move scratch_pd and scratch_pt into vm area

[Michel Thierry <michel.thierry@intel.com>]

On 5/22/2015 6:05 PM, Mika Kuoppala wrote:
> Scratch page is part of i915_address_space due to that we
> have only one of that. Move other scratch entities into
> the same struct. This is a preparatory patch for having
> only one instance of each scratch_pt/pd.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

Reviewed-by: Michel Thierry <michel.thierry@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem_gtt.c | 51 +++++++++++++++++--------------------
>   drivers/gpu/drm/i915/i915_gem_gtt.h |  7 +++--
>   2 files changed, 27 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index a1d6d7a..61f4da0 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -608,12 +608,9 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
>   static void gen8_initialize_pd(struct i915_address_space *vm,
>                                 struct i915_page_directory *pd)
>   {
> -       struct i915_hw_ppgtt *ppgtt =
> -               container_of(vm, struct i915_hw_ppgtt, base);
>          gen8_pde_t scratch_pde;
>
> -       scratch_pde = gen8_pde_encode(px_dma(ppgtt->scratch_pt),
> -                                     I915_CACHE_LLC);
> +       scratch_pde = gen8_pde_encode(px_dma(vm->scratch_pt), I915_CACHE_LLC);
>
>          fill_px(vm->dev, pd, scratch_pde);
>   }
> @@ -648,8 +645,8 @@ static void gen8_ppgtt_cleanup(struct i915_address_space *vm)
>                  free_pd(ppgtt->base.dev, ppgtt->pdp.page_directory[i]);
>          }
>
> -       free_pd(ppgtt->base.dev, ppgtt->scratch_pd);
> -       free_pt(ppgtt->base.dev, ppgtt->scratch_pt);
> +       free_pd(vm->dev, vm->scratch_pd);
> +       free_pt(vm->dev, vm->scratch_pt);
>   }
>
>   /**
> @@ -685,7 +682,7 @@ static int gen8_ppgtt_alloc_pagetabs(struct i915_hw_ppgtt *ppgtt,
>                  /* Don't reallocate page tables */
>                  if (pt) {
>                          /* Scratch is never allocated this way */
> -                       WARN_ON(pt == ppgtt->scratch_pt);
> +                       WARN_ON(pt == ppgtt->base.scratch_pt);
>                          continue;
>                  }
>
> @@ -977,16 +974,16 @@ static int gen8_preallocate_top_level_pdps(struct i915_hw_ppgtt *ppgtt)
>    */
>   static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
>   {
> -       ppgtt->scratch_pt = alloc_pt(ppgtt->base.dev);
> -       if (IS_ERR(ppgtt->scratch_pt))
> -               return PTR_ERR(ppgtt->scratch_pt);
> +       ppgtt->base.scratch_pt = alloc_pt(ppgtt->base.dev);
> +       if (IS_ERR(ppgtt->base.scratch_pt))
> +               return PTR_ERR(ppgtt->base.scratch_pt);
>
> -       ppgtt->scratch_pd = alloc_pd(ppgtt->base.dev);
> -       if (IS_ERR(ppgtt->scratch_pd))
> -               return PTR_ERR(ppgtt->scratch_pd);
> +       ppgtt->base.scratch_pd = alloc_pd(ppgtt->base.dev);
> +       if (IS_ERR(ppgtt->base.scratch_pd))
> +               return PTR_ERR(ppgtt->base.scratch_pd);
>
> -       gen8_initialize_pt(&ppgtt->base, ppgtt->scratch_pt);
> -       gen8_initialize_pd(&ppgtt->base, ppgtt->scratch_pd);
> +       gen8_initialize_pt(&ppgtt->base, ppgtt->base.scratch_pt);
> +       gen8_initialize_pd(&ppgtt->base, ppgtt->base.scratch_pd);
>
>          ppgtt->base.start = 0;
>          ppgtt->base.total = 1ULL << 32;
> @@ -1019,7 +1016,8 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)
>          uint32_t  pte, pde, temp;
>          uint32_t start = ppgtt->base.start, length = ppgtt->base.total;
>
> -       scratch_pte = vm->pte_encode(px_dma(vm->scratch_page), I915_CACHE_LLC, true, 0);
> +       scratch_pte = vm->pte_encode(px_dma(vm->scratch_page),
> +                                    I915_CACHE_LLC, true, 0);
>
>          gen6_for_each_pde(unused, &ppgtt->pd, start, length, temp, pde) {
>                  u32 expected;
> @@ -1348,7 +1346,7 @@ static int gen6_alloc_va_range(struct i915_address_space *vm,
>           * tables.
>           */
>          gen6_for_each_pde(pt, &ppgtt->pd, start, length, temp, pde) {
> -               if (pt != ppgtt->scratch_pt) {
> +               if (pt != vm->scratch_pt) {
>                          WARN_ON(bitmap_empty(pt->used_ptes, GEN6_PTES));
>                          continue;
>                  }
> @@ -1403,7 +1401,7 @@ unwind_out:
>          for_each_set_bit(pde, new_page_tables, I915_PDES) {
>                  struct i915_page_table *pt = ppgtt->pd.page_table[pde];
>
> -               ppgtt->pd.page_table[pde] = ppgtt->scratch_pt;
> +               ppgtt->pd.page_table[pde] = vm->scratch_pt;
>                  free_pt(vm->dev, pt);
>          }
>
> @@ -1418,15 +1416,14 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm)
>          struct i915_page_table *pt;
>          uint32_t pde;
>
> -
>          drm_mm_remove_node(&ppgtt->node);
>
>          gen6_for_all_pdes(pt, ppgtt, pde) {
> -               if (pt != ppgtt->scratch_pt)
> +               if (pt != vm->scratch_pt)
>                          free_pt(ppgtt->base.dev, pt);
>          }
>
> -       free_pt(ppgtt->base.dev, ppgtt->scratch_pt);
> +       free_pt(vm->dev, vm->scratch_pt);
>   }
>
>   static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt)
> @@ -1441,11 +1438,11 @@ static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt)
>           * size. We allocate at the top of the GTT to avoid fragmentation.
>           */
>          BUG_ON(!drm_mm_initialized(&dev_priv->gtt.base.mm));
> -       ppgtt->scratch_pt = alloc_pt(ppgtt->base.dev);
> -       if (IS_ERR(ppgtt->scratch_pt))
> -               return PTR_ERR(ppgtt->scratch_pt);
> +       ppgtt->base.scratch_pt = alloc_pt(ppgtt->base.dev);
> +       if (IS_ERR(ppgtt->base.scratch_pt))
> +               return PTR_ERR(ppgtt->base.scratch_pt);
>
> -       gen6_initialize_pt(&ppgtt->base, ppgtt->scratch_pt);
> +       gen6_initialize_pt(&ppgtt->base, ppgtt->base.scratch_pt);
>
>   alloc:
>          ret = drm_mm_insert_node_in_range_generic(&dev_priv->gtt.base.mm,
> @@ -1476,7 +1473,7 @@ alloc:
>          return 0;
>
>   err_out:
> -       free_pt(ppgtt->base.dev, ppgtt->scratch_pt);
> +       free_pt(ppgtt->base.dev, ppgtt->base.scratch_pt);
>          return ret;
>   }
>
> @@ -1492,7 +1489,7 @@ static void gen6_scratch_va_range(struct i915_hw_ppgtt *ppgtt,
>          uint32_t pde, temp;
>
>          gen6_for_each_pde(unused, &ppgtt->pd, start, length, temp, pde)
> -               ppgtt->pd.page_table[pde] = ppgtt->scratch_pt;
> +               ppgtt->pd.page_table[pde] = ppgtt->base.scratch_pt;
>   }
>
>   static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 1fd4041..ba46374 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -248,6 +248,8 @@ struct i915_address_space {
>          u64 total;              /* size addr space maps (ex. 2GB for ggtt) */
>
>          struct i915_page_scratch *scratch_page;
> +       struct i915_page_table *scratch_pt;
> +       struct i915_page_directory *scratch_pd;
>
>          /**
>           * List of objects currently involved in rendering.
> @@ -337,9 +339,6 @@ struct i915_hw_ppgtt {
>                  struct i915_page_directory pd;
>          };
>
> -       struct i915_page_table *scratch_pt;
> -       struct i915_page_directory *scratch_pd;
> -
>          struct drm_i915_file_private *file_priv;
>
>          gen6_pte_t __iomem *pd_addr;
> @@ -481,7 +480,7 @@ i915_page_dir_dma_addr(const struct i915_hw_ppgtt *ppgtt, const unsigned n)
>   {
>          return test_bit(n, ppgtt->pdp.used_pdpes) ?
>                  px_dma(ppgtt->pdp.page_directory[n]) :
> -               px_dma(ppgtt->scratch_pd);
> +               px_dma(ppgtt->base.scratch_pd);
>   }
>
>   int i915_gem_gtt_init(struct drm_device *dev);
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx