drm/i915: clean up aliasing_gtt_bind_vma
Subsystems (2)
PATCH 1/1 drm/i915: clean up aliasing_gtt_bind_vma
No point in initialising pages with obj->pages, only to overwrite it with ggtt_view.pages later. So lets just get rid of pages altogether.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -7
@@ -2616,29 +2616,25 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma,struct drm_device *dev = vma->vm->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *obj = vma->obj; -struct sg_table *pages = obj->pages;u32 pte_flags =0 ;int ret; ret =i915_get_ggtt_vma_pages (vma);if (ret)return ret; - pages = vma->ggtt_view.pages;/* Currently applicable only to VLV */ if (obj->gt_ro) pte_flags |=PTE_READ_ONLY ; - -if (flags &GLOBAL_BIND ) { - vma->vm->insert_entries (vma->vm, pages, +if (flags &GLOBAL_BIND ) + vma->vm->insert_entries (vma->vm, vma->ggtt_view.pages, vma->node.start, cache_level, pte_flags); - }if (flags &LOCAL_BIND ) {struct i915_hw_ppgtt *appgtt = dev_priv->mm.aliasing_ppgtt; - appgtt->base.insert_entries (&appgtt->base, pages, + appgtt->base.insert_entries (&appgtt->base, vma->ggtt_view.pages, vma->node.start, cache_level, pte_flags); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Matthew Auld
No point in initialising pages with
obj->pages, only to overwrite it with ggtt_view.pages later. So lets just get rid of pages altogether.
You can do more. Perhaps review and ping Daniel to actually apply id:[email protected] this time.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: clean up aliasing_gtt_bind_vma
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: clean up aliasing_gtt_bind_vma
URL : https://patchwork.freedesktop.org/series/4815/
State : failure
== Summary ==
Series 4815v1 drm/i915: clean up aliasing_gtt_bind_vma
2016-03-23T15:56:28.165993 http://patchwork.freedesktop.org/api/1.0/series/4815/revisions/1/mbox/
Applying: drm/i915: clean up aliasing_gtt_bind_vma
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Patch failed at 0001 drm/i915: clean up aliasing_gtt_bind_vma
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx