Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm...

Driver Changes:

- Prepare for local/device memory support on DG1 by starting
  to use it for kernel internal allocations: context, ring
  and engine scratch (Matt A, CQ, Abdiel, Imre)
- Sandybridge fix to avoid hard hang on ring resume (Chris)
- Limit imported dma-buf size to int32 (Matt A)
- Double check heartbeat timeout before resetting (Chris)

- Use new tasklet API for execution list (Emil)
- Fix SPDX checkpats warnings (Chris)
- Fixes for various checkpatch warnings (Chris)
- Selftest improvements (Chris)
- Move the defer_request waiter active assertion to correct spot (Chris)
- Make local-memory probing a GT operation (Matt, Tvrtko)
- Protect against request freeing during cancellation on wedging (Chris)
- Retire unexpected starting state error dumping (Chris)
- Distinction of memory regions in debugging (Zbigniew)
- Always flush the submission queue on checking for idle (Chris)

- Consolidate 2big error check to helper (Matt)
- Decrease number of subplatform bits (Tvrtko)
- Remove unused internal request priority levels (Chris)
- Document the unused internal header bits in buddy allocator (Matt)
- Cleanup the region class/instance encoding (Matt)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YGxksaZGXHnFxlwg@jlahtine-mobl.ger.corp.intel.com

diff --cc drivers/gpu/drm/i915/display/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_object.h
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_region.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_stolen.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_userptr.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_context_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_engine_cs.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_engine_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_execlists_submission.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_ggtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt_requests.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gtt.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_lrc.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_ppgtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_renderstate.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_reset.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_ring_submission.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_timeline.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_timeline.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_timeline_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_workarounds.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/mock_engine.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_engine_cs.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_execlists.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_hangcheck.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_lrc.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_mocs.c
index f00b914,44609d1..e55a887
--- 1/drivers/gpu/drm/i915/gt/selftest_mocs.c
--- 2/drivers/gpu/drm/i915/gt/selftest_mocs.c
+++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c
@@@ -70,13 -69,12 +69,13 @@@ static int live_mocs_init(struct live_m
                return -EINVAL;
  
        if (flags & HAS_RENDER_L3CC)
-               arg->l3cc = table;
+               arg->l3cc = &arg->table;
  
        if (flags & (HAS_GLOBAL_MOCS | HAS_ENGINE_MOCS))
-               arg->mocs = table;
+               arg->mocs = &arg->table;
  
 -      arg->scratch = __vm_create_scratch_for_read(&gt->ggtt->vm, PAGE_SIZE);
 +      arg->scratch =
 +              __vm_create_scratch_for_read_pinned(&gt->ggtt->vm, PAGE_SIZE);
        if (IS_ERR(arg->scratch))
                return PTR_ERR(arg->scratch);
  

diff --cc drivers/gpu/drm/i915/gt/selftest_timeline.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/selftest_workarounds.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_request.c
index 63968d1,8b42233..9165971
--- 1/drivers/gpu/drm/i915/i915_request.c
--- 2/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@@ -606,16 -510,14 +606,16 @@@ bool i915_request_set_error_once(struc
        old = READ_ONCE(rq->fence.error);
        do {
                if (fatal_error(old))
 -                      return;
 +                      return false;
        } while (!try_cmpxchg(&rq->fence.error, &old, error));
 +
 +      return true;
  }
  
- void i915_request_mark_eio(struct i915_request *rq)
+ struct i915_request *i915_request_mark_eio(struct i915_request *rq)
  {
        if (__i915_request_is_complete(rq))
-               return;
+               return NULL;
  
        GEM_BUG_ON(i915_request_signaled(rq));
  

diff --cc drivers/gpu/drm/i915/i915_request.h
index 36071d3,c0bd4cb..270f6cd
--- 1/drivers/gpu/drm/i915/i915_request.h
--- 2/drivers/gpu/drm/i915/i915_request.h
+++ b/drivers/gpu/drm/i915/i915_request.h
@@@ -308,8 -310,8 +308,8 @@@ struct i915_request * __must_chec
  i915_request_create(struct intel_context *ce);
  
  void __i915_request_skip(struct i915_request *rq);
 -void i915_request_set_error_once(struct i915_request *rq, int error);
 +bool i915_request_set_error_once(struct i915_request *rq, int error);
- void i915_request_mark_eio(struct i915_request *rq);
+ struct i915_request *i915_request_mark_eio(struct i915_request *rq);
  
  struct i915_request *__i915_request_commit(struct i915_request *request);
  void __i915_request_queue(struct i915_request *rq,

diff --cc drivers/gpu/drm/i915/selftests/intel_memory_region.c
Simple merge