From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 25 Jan 2014 20:14:57 +0000 (+0100)
Subject: Merge branch 'topic/ppgtt' into drm-intel-next-queued
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0e5539b923e3cfb79512b61f6f6137f865160804;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'topic/ppgtt' into drm-intel-next-queued

Because whatever.*

* This should contain a fairly long list of issues and still
unresolved resgressions, but I didn't really get a vote.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

0e5539b923e3cfb79512b61f6f6137f865160804
diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
index d269ecf46e26,0843e0ec5f1b..bd5f4e756289
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@@ -91,9 -91,10 +91,10 @@@ eb_lookup_vmas(struct eb_vmas *eb
  	       struct i915_address_space *vm,
  	       struct drm_file *file)
  {
+ 	struct drm_i915_private *dev_priv = vm->dev->dev_private;
  	struct drm_i915_gem_object *obj;
  	struct list_head objects;
 -	int i, ret = 0;
 +	int i, ret;
  
  	INIT_LIST_HEAD(&objects);
  	spin_lock(&file->table_lock);
@@@ -123,13 -124,23 +124,27 @@@
  	spin_unlock(&file->table_lock);
  
  	i = 0;
 -	list_for_each_entry(obj, &objects, obj_exec_link) {
 +	while (!list_empty(&objects)) {
  		struct i915_vma *vma;
+ 		struct i915_address_space *bind_vm = vm;
+ 
+ 		if (exec[i].flags & EXEC_OBJECT_NEEDS_GTT &&
+ 		    USES_FULL_PPGTT(vm->dev)) {
+ 			ret = -EINVAL;
+ 			goto out;
+ 		}
+ 
+ 		/* If we have secure dispatch, or the userspace assures us that
+ 		 * they know what they're doing, use the GGTT VM.
+ 		 */
+ 		if (((args->flags & I915_EXEC_SECURE) &&
+ 		    (i == (args->buffer_count - 1))))
+ 			bind_vm = &dev_priv->gtt.base;
  
 +		obj = list_first_entry(&objects,
 +				       struct drm_i915_gem_object,
 +				       obj_exec_link);
 +
  		/*
  		 * NOTE: We can leak any vmas created here when something fails
  		 * later on. But that's no issue since vma_unbind can deal with
diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
index 6c3a6e60aeac,6e9e6219f093..3192089cb0bf
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@@ -1438,11 -1727,7 +1727,10 @@@ static int i915_gmch_probe(struct drm_d
  
  	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.insert_entries = i915_ggtt_insert_entries;
  
 +	if (unlikely(dev_priv->gtt.do_idle_maps))
 +		DRM_INFO("applying Ironlake quirks for intel_iommu\n");
 +
  	return 0;
  }