| Message ID | 1374458899-8635-8-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jul 21, 2013 at 07:08:14PM -0700, Ben Widawsky wrote: > With bind/unbind function pointers in place, we no longer need > insert_entries. We could, and want, to remove clear_range, however it's > not totally easy at this point. Since it's used in a couple of place > still that don't only deal in objects: setup, ppgtt init, and restore > gtt mappings. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Oh, ->insert_entries has become defunct in the previous patches. I didn't spot this ... Not great for rebasing -internal since such changes pretty much guarantee that I botch the rebase. And I think we want to keep these interfaces here. -Daniel > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 1de49a0..5c04887 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -315,7 +315,6 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) > ppgtt->base.unmap_vma = NULL; > ppgtt->base.clear_range = gen6_ppgtt_clear_range; > ppgtt->base.map_vma = NULL; > - ppgtt->base.insert_entries = gen6_ppgtt_insert_entries; > ppgtt->base.cleanup = gen6_ppgtt_cleanup; > ppgtt->base.scratch = dev_priv->gtt.base.scratch; > ppgtt->pt_pages = kzalloc(sizeof(struct page *)*ppgtt->num_pd_entries, > @@ -570,19 +569,6 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm, > readl(gtt_base); > } > > - > -static void i915_ggtt_insert_entries(struct i915_address_space *vm, > - struct sg_table *st, > - unsigned int pg_start, > - enum i915_cache_level cache_level) > -{ > - unsigned int flags = (cache_level == I915_CACHE_NONE) ? > - AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY; > - > - intel_gtt_insert_sg_entries(st, pg_start, flags); > - > -} > - > static void i915_ggtt_map_vma(struct i915_vma *vma, > enum i915_cache_level cache_level, > u32 unused) > @@ -895,7 +881,6 @@ static int gen6_gmch_probe(struct drm_device *dev, > > dev_priv->gtt.base.clear_range = gen6_ggtt_clear_range; > dev_priv->gtt.base.unmap_vma = gen6_ggtt_unmap_vma; > - dev_priv->gtt.base.insert_entries = gen6_ggtt_insert_entries; > dev_priv->gtt.base.map_vma = gen6_ggtt_map_vma; > > return ret; > @@ -929,7 +914,6 @@ static int i915_gmch_probe(struct drm_device *dev, > dev_priv->gtt.do_idle_maps = needs_idle_maps(dev_priv->dev); > dev_priv->gtt.base.clear_range = i915_ggtt_clear_range; > dev_priv->gtt.base.unmap_vma = i915_ggtt_unmap_vma; > - dev_priv->gtt.base.insert_entries = i915_ggtt_insert_entries; > dev_priv->gtt.base.map_vma = i915_ggtt_map_vma; > > return 0; > -- > 1.8.3.3 > > _______________________________________________ > 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 1de49a0..5c04887 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -315,7 +315,6 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) ppgtt->base.unmap_vma = NULL; ppgtt->base.clear_range = gen6_ppgtt_clear_range; ppgtt->base.map_vma = NULL; - ppgtt->base.insert_entries = gen6_ppgtt_insert_entries; ppgtt->base.cleanup = gen6_ppgtt_cleanup; ppgtt->base.scratch = dev_priv->gtt.base.scratch; ppgtt->pt_pages = kzalloc(sizeof(struct page *)*ppgtt->num_pd_entries, @@ -570,19 +569,6 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm, readl(gtt_base); } - -static void i915_ggtt_insert_entries(struct i915_address_space *vm, - struct sg_table *st, - unsigned int pg_start, - enum i915_cache_level cache_level) -{ - unsigned int flags = (cache_level == I915_CACHE_NONE) ? - AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY; - - intel_gtt_insert_sg_entries(st, pg_start, flags); - -} - static void i915_ggtt_map_vma(struct i915_vma *vma, enum i915_cache_level cache_level, u32 unused) @@ -895,7 +881,6 @@ static int gen6_gmch_probe(struct drm_device *dev, dev_priv->gtt.base.clear_range = gen6_ggtt_clear_range; dev_priv->gtt.base.unmap_vma = gen6_ggtt_unmap_vma; - dev_priv->gtt.base.insert_entries = gen6_ggtt_insert_entries; dev_priv->gtt.base.map_vma = gen6_ggtt_map_vma; return ret; @@ -929,7 +914,6 @@ static int i915_gmch_probe(struct drm_device *dev, dev_priv->gtt.do_idle_maps = needs_idle_maps(dev_priv->dev); dev_priv->gtt.base.clear_range = i915_ggtt_clear_range; dev_priv->gtt.base.unmap_vma = i915_ggtt_unmap_vma; - dev_priv->gtt.base.insert_entries = i915_ggtt_insert_entries; dev_priv->gtt.base.map_vma = i915_ggtt_map_vma; return 0;
With bind/unbind function pointers in place, we no longer need insert_entries. We could, and want, to remove clear_range, however it's not totally easy at this point. Since it's used in a couple of place still that don't only deal in objects: setup, ppgtt init, and restore gtt mappings. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 ---------------- 1 file changed, 16 deletions(-)