Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...

From: Lucas Stach <l.stach@pengutronix.de>
"not much to de-stage this time. Changes from Philipp and Souptick to
use memset32 more and switch the fault handler to the new vm_fault_t
and two small fixes for issues that can be hit in rare corner cases
from me."

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1533563808.2809.7.camel@pengutronix.de

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gpu.c
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_sched.c
index 3949f18afb3527e8b18fdcffc717af46ba45276b,b267d9c4d91ce52b30c97ecb2d04375a8db90803..69e9b431bf1f02ec7c87e5f740f80595ad98dd53
--- 1/drivers/gpu/drm/etnaviv/etnaviv_sched.c
--- 2/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@@ -140,15 -140,21 +140,21 @@@ static const struct drm_sched_backend_o
  int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity,
                           struct etnaviv_gem_submit *submit)
  {
-       int ret;
+       int ret = 0;
+ 
+       /*
+        * Hold the fence lock across the whole operation to avoid jobs being
+        * pushed out of order with regard to their sched fence seqnos as
+        * allocated in drm_sched_job_init.
+        */
+       mutex_lock(&submit->gpu->fence_lock);
  
 -      ret = drm_sched_job_init(&submit->sched_job, &submit->gpu->sched,
 -                               sched_entity, submit->cmdbuf.ctx);
 +      ret = drm_sched_job_init(&submit->sched_job, sched_entity,
 +                               submit->cmdbuf.ctx);
        if (ret)
-               return ret;
+               goto out_unlock;
  
        submit->out_fence = dma_fence_get(&submit->sched_job.s_fence->finished);
-       mutex_lock(&submit->gpu->fence_idr_lock);
        submit->out_fence_id = idr_alloc_cyclic(&submit->gpu->fence_idr,
                                                submit->out_fence, 0,
                                                INT_MAX, GFP_KERNEL);