[Intel-gfx] [PATCH] drm/i915: Do not re-allocate vmas in aliasing ppgtt

Michel Thierry michel.thierry at intel.com
Wed Apr 22 09:13:38 PDT 2015


Aliasing ppgtt is fully allocated right after creation, thus shouldn't
need to call allocate_va_range in i915_vma_bind.

This duplication started after commit 5c5f645773b6d147bf68c350674dc3ef4f8de83d
("drm/i915: drm/i915: Unify aliasing ppgtt handling"), as aliasing ppgtt
now also uses allocate_va_range.

Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala at intel.com>
Signed-off-by: Michel Thierry <michel.thierry at intel.com>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 7b13273..e8c0ab0 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3242,7 +3242,7 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,
 {
 	int ret;
 
-	if (vma->vm->allocate_va_range) {
+	if (vma->vm->allocate_va_range && USES_FULL_PPGTT(dev)) {
 		trace_i915_va_alloc(vma->vm, vma->node.start,
 				    vma->node.size,
 				    VM_TO_TRACE_NAME(vma->vm));
-- 
2.1.1



More information about the Intel-gfx mailing list