Merge tag 'drm-intel-next-fixes-2019-03-12' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

- HDCP state handling in ddi_update_pipe
- Protect i915_active iterators from the shrinker
- Reacquire priolist cache after dropping the engine lock
- (Selftest) Always free spinner on __sseu_prepare error
- Acquire breadcrumb ref before canceling
- Fix atomic state leak on HDMI link reset
- Relax mmap VMA check

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190312205551.GA7701@intel.com

6 files changed, 94 insertions, 73 deletions

diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 215b6ff8aa73..db7bb5bd5add 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -163,17 +163,25 @@ int i915_active_ref(struct i915_active *ref,
                     struct i915_request *rq)
 {
         struct i915_active_request *active;
+        int err = 0;
+
+        /* Prevent reaping in case we malloc/wait while building the tree */
+        i915_active_acquire(ref);
 
         active = active_instance(ref, timeline);
-        if (IS_ERR(active))
-                return PTR_ERR(active);
+        if (IS_ERR(active)) {
+                err = PTR_ERR(active);
+                goto out;
+        }
 
         if (!i915_active_request_isset(active))
                 ref->count++;
         __i915_active_request_set(active, rq);
 
         GEM_BUG_ON(!ref->count);
-        return 0;
+out:
+        i915_active_release(ref);
+        return err;
 }
 
 bool i915_active_acquire(struct i915_active *ref)
@@ -223,19 +231,25 @@ int i915_request_await_active_request(struct i915_request *rq,
 int i915_request_await_active(struct i915_request *rq, struct i915_active *ref)
 {
         struct active_node *it, *n;
-        int ret;
+        int err = 0;
 
-        ret = i915_request_await_active_request(rq, &ref->last);
-        if (ret)
-                return ret;
+        /* await allocates and so we need to avoid hitting the shrinker */
+        if (i915_active_acquire(ref))
+                goto out; /* was idle */
+
+        err = i915_request_await_active_request(rq, &ref->last);
+        if (err)
+                goto out;
 
         rbtree_postorder_for_each_entry_safe(it, n, &ref->tree, node) {
-                ret = i915_request_await_active_request(rq, &it->base);
-                if (ret)
-                        return ret;
+                err = i915_request_await_active_request(rq, &it->base);
+                if (err)
+                        goto out;
         }
 
-        return 0;
+out:
+        i915_active_release(ref);
+        return err;
 }
 
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6728ea5c71d4..30d516e975c6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1688,7 +1688,8 @@ __vma_matches(struct vm_area_struct *vma, struct file *filp,
         if (vma->vm_file != filp)
                 return false;
 
-        return vma->vm_start == addr && (vma->vm_end - vma->vm_start) == size;
+        return vma->vm_start == addr &&
+               (vma->vm_end - vma->vm_start) == PAGE_ALIGN(size);
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
index d01683167c77..8bc042551692 100644
--- a/drivers/gpu/drm/i915/i915_scheduler.c
+++ b/drivers/gpu/drm/i915/i915_scheduler.c
@@ -223,8 +223,14 @@ out:
         return &p->requests[idx];
 }
 
+struct sched_cache {
+        struct list_head *priolist;
+};
+
 static struct intel_engine_cs *
-sched_lock_engine(struct i915_sched_node *node, struct intel_engine_cs *locked)
+sched_lock_engine(const struct i915_sched_node *node,
+                  struct intel_engine_cs *locked,
+                  struct sched_cache *cache)
 {
         struct intel_engine_cs *engine = node_to_request(node)->engine;
 
@@ -232,6 +238,7 @@ sched_lock_engine(struct i915_sched_node *node, struct intel_engine_cs *locked)
 
         if (engine != locked) {
                 spin_unlock(&locked->timeline.lock);
+                memset(cache, 0, sizeof(*cache));
                 spin_lock(&engine->timeline.lock);
         }
 
@@ -253,11 +260,11 @@ static bool inflight(const struct i915_request *rq,
 static void __i915_schedule(struct i915_request *rq,
                             const struct i915_sched_attr *attr)
 {
-        struct list_head *uninitialized_var(pl);
-        struct intel_engine_cs *engine, *last;
+        struct intel_engine_cs *engine;
         struct i915_dependency *dep, *p;
         struct i915_dependency stack;
         const int prio = attr->priority;
+        struct sched_cache cache;
         LIST_HEAD(dfs);
 
         /* Needed in order to use the temporary link inside i915_dependency */
@@ -328,7 +335,7 @@ static void __i915_schedule(struct i915_request *rq,
                 __list_del_entry(&stack.dfs_link);
         }
 
-        last = NULL;
+        memset(&cache, 0, sizeof(cache));
         engine = rq->engine;
         spin_lock_irq(&engine->timeline.lock);
 
@@ -338,7 +345,7 @@ static void __i915_schedule(struct i915_request *rq,
 
                 INIT_LIST_HEAD(&dep->dfs_link);
 
-                engine = sched_lock_engine(node, engine);
+                engine = sched_lock_engine(node, engine, &cache);
                 lockdep_assert_held(&engine->timeline.lock);
 
                 /* Recheck after acquiring the engine->timeline.lock */
@@ -347,11 +354,11 @@ static void __i915_schedule(struct i915_request *rq,
 
                 node->attr.priority = prio;
                 if (!list_empty(&node->link)) {
-                        if (last != engine) {
-                                pl = i915_sched_lookup_priolist(engine, prio);
-                                last = engine;
-                        }
-                        list_move_tail(&node->link, pl);
+                        if (!cache.priolist)
+                                cache.priolist =
+                                        i915_sched_lookup_priolist(engine,
+                                                                   prio);
+                        list_move_tail(&node->link, cache.priolist);
                 } else {
                         /*
                          * If the request is not in the priolist queue because
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index cacaa1d04d17..09ed90c0ba00 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -106,16 +106,6 @@ bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
 
                         GEM_BUG_ON(!test_bit(I915_FENCE_FLAG_SIGNAL,
                                              &rq->fence.flags));
-                        clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags);