fixup! drm/i915: Use multiple VMsppgtt-POC

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 0f6bf3c02810..5737cb272d1d 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -404,7 +404,6 @@ i915_gem_execbuffer_reserve_object(struct drm_i915_gem_object *obj,
 				   struct i915_address_space *vm,
 				   bool *need_reloc)
 {
-	struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
 	struct drm_i915_gem_exec_object2 *entry = obj->exec_entry;
 	bool has_fenced_gpu_access = INTEL_INFO(ring->dev)->gen < 4;
 	bool need_fence, need_mappable;
@@ -436,23 +435,9 @@ i915_gem_execbuffer_reserve_object(struct drm_i915_gem_object *obj,
 		}
 	}
 
-	/* Ensure ppgtt mapping exists if needed */
-	if (is_i915_ggtt(vm) &&
-	    dev_priv->gtt.aliasing_ppgtt && !obj->has_aliasing_ppgtt_mapping) {
-		/* FIXME: remove this later */
-		struct i915_address_space *appgtt =
-			&dev_priv->gtt.aliasing_ppgtt->base;
-		unsigned long obj_offset = i915_gem_obj_offset(obj, appgtt);
-
-		appgtt->insert_entries(appgtt, obj->pages,
-				       obj_offset >> PAGE_SHIFT,
-				       obj->cache_level);
-		obj->has_aliasing_ppgtt_mapping = 1;
-	} else {
-		vm->insert_entries(vm, obj->pages,
-				   i915_gem_obj_offset(obj, vm) >> PAGE_SHIFT,
-				   obj->cache_level);
-	}
+	vm->insert_entries(vm, obj->pages,
+			   i915_gem_obj_offset(obj, vm) >> PAGE_SHIFT,
+			   obj->cache_level);
 
 	if (entry->offset != i915_gem_obj_offset(obj, vm)) {
 		entry->offset = i915_gem_obj_offset(obj, vm);