[PATCH] drm/i915: clean up aliasing_gtt_bind_vma

[PATCH] drm/i915: clean up aliasing_gtt_bind_vma

[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.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0715bb7..3022960 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -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);
 	}
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: clean up aliasing_gtt_bind_vma

[Chris Wilson]

On Wed, Mar 23, 2016 at 04:18:33PM +0000, Matthew Auld wrote:
> 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:1448015238-24639-1-git-send-email-chris@chris-wilson.co.uk
this time.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: clean up aliasing_gtt_bind_vma

[Patchwork]

== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx