| Message ID | 1432314314-23530-18-git-send-email-mika.kuoppala@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 5/22/2015 6:05 PM, Mika Kuoppala wrote: > Write page directory entry without using superfluous > indirect function. Also remove unused device parameter > from the encode function. > > 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 | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index b938964..a1d6d7a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -192,9 +192,8 @@ static gen8_pte_t gen8_pte_encode(dma_addr_t addr, > return pte; > } > > -static gen8_pde_t gen8_pde_encode(struct drm_device *dev, > - dma_addr_t addr, > - enum i915_cache_level level) > +static gen8_pde_t gen8_pde_encode(const dma_addr_t addr, > + const enum i915_cache_level level) > { > gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; > pde |= addr; > @@ -606,15 +605,6 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, > kunmap_px(ppgtt, pt_vaddr); > } > > -static void __gen8_do_map_pt(gen8_pde_t * const pde, > - struct i915_page_table *pt, > - struct drm_device *dev) > -{ > - gen8_pde_t entry = > - gen8_pde_encode(dev, px_dma(pt), I915_CACHE_LLC); > - *pde = entry; > -} > - > static void gen8_initialize_pd(struct i915_address_space *vm, > struct i915_page_directory *pd) > { > @@ -622,7 +612,7 @@ static void gen8_initialize_pd(struct i915_address_space *vm, > container_of(vm, struct i915_hw_ppgtt, base); > gen8_pde_t scratch_pde; > > - scratch_pde = gen8_pde_encode(vm->dev, px_dma(ppgtt->scratch_pt), > + scratch_pde = gen8_pde_encode(px_dma(ppgtt->scratch_pt), > I915_CACHE_LLC); > > fill_px(vm->dev, pd, scratch_pde); > @@ -906,7 +896,8 @@ static int gen8_alloc_va_range(struct i915_address_space *vm, > set_bit(pde, pd->used_pdes); > > /* Map the PDE to the page table */ > - __gen8_do_map_pt(page_directory + pde, pt, vm->dev); > + page_directory[pde] = gen8_pde_encode(px_dma(pt), > + I915_CACHE_LLC); > > /* NB: We haven't yet mapped ptes to pages. At this > * point we're still relying on insert_entries() */ > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index b938964..a1d6d7a 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -192,9 +192,8 @@ static gen8_pte_t gen8_pte_encode(dma_addr_t addr, return pte; } -static gen8_pde_t gen8_pde_encode(struct drm_device *dev, - dma_addr_t addr, - enum i915_cache_level level) +static gen8_pde_t gen8_pde_encode(const dma_addr_t addr, + const enum i915_cache_level level) { gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; pde |= addr; @@ -606,15 +605,6 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, kunmap_px(ppgtt, pt_vaddr); } -static void __gen8_do_map_pt(gen8_pde_t * const pde, - struct i915_page_table *pt, - struct drm_device *dev) -{ - gen8_pde_t entry = - gen8_pde_encode(dev, px_dma(pt), I915_CACHE_LLC); - *pde = entry; -} - static void gen8_initialize_pd(struct i915_address_space *vm, struct i915_page_directory *pd) { @@ -622,7 +612,7 @@ static void gen8_initialize_pd(struct i915_address_space *vm, container_of(vm, struct i915_hw_ppgtt, base); gen8_pde_t scratch_pde; - scratch_pde = gen8_pde_encode(vm->dev, px_dma(ppgtt->scratch_pt), + scratch_pde = gen8_pde_encode(px_dma(ppgtt->scratch_pt), I915_CACHE_LLC); fill_px(vm->dev, pd, scratch_pde); @@ -906,7 +896,8 @@ static int gen8_alloc_va_range(struct i915_address_space *vm, set_bit(pde, pd->used_pdes); /* Map the PDE to the page table */ - __gen8_do_map_pt(page_directory + pde, pt, vm->dev); + page_directory[pde] = gen8_pde_encode(px_dma(pt), + I915_CACHE_LLC); /* NB: We haven't yet mapped ptes to pages. At this * point we're still relying on insert_entries() */
Write page directory entry without using superfluous indirect function. Also remove unused device parameter from the encode function. Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)