Backmerge i915 security patches from commit '826035bbac8f' into drm-next

This backmerges the branch that ended up in Linus' tree. It removes
all the changes for the rc6 patches from Linus' tree in favour of
a patch that is based on a large refactor that occured.

Otherwise it all looks good.

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

diff --cc drivers/gpu/drm/i915/gem/i915_gem_context.c
index de6e55af82cf71a49edf2f4b9538d207e6cb2e5d,e41fd94ae5a9d98c76bc84fe3de471408316ef54..138c8e33d26b4ce34f9b647720c2a1fb5e47337d
--- 1/drivers/gpu/drm/i915/gem/i915_gem_context.c
--- 2/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@@ -527,10 -443,9 +529,13 @@@ __create_context(struct drm_i915_privat
        for (i = 0; i < ARRAY_SIZE(ctx->hang_timestamp); i++)
                ctx->hang_timestamp[i] = jiffies - CONTEXT_FAST_HANG_JIFFIES;
  
+       ctx->jump_whitelist = NULL;
+       ctx->jump_whitelist_cmds = 0;
+ 
 +      spin_lock(&i915->gem.contexts.lock);
 +      list_add_tail(&ctx->link, &i915->gem.contexts.list);
 +      spin_unlock(&i915->gem.contexts.lock);
 +
        return ctx;
  
  err_free:

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

diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index e4f5c269150ab26789a0d30814e9aa48bee9db92,e635e1e5f4d308eb903c85f0710dcfd13c316418..f0998f1225af15a16bd8384dcf4df903c958c638
--- 1/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
--- 2/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@@ -1994,9 -1988,11 +2023,11 @@@ static struct i915_vma *eb_parse(struc
  {
        struct intel_engine_pool_node *pool;
        struct i915_vma *vma;
+       u64 batch_start;
+       u64 shadow_batch_start;
        int err;
  
 -      pool = intel_engine_pool_get(&eb->engine->pool, eb->batch_len);
 +      pool = intel_engine_get_pool(eb->engine, eb->batch_len);
        if (IS_ERR(pool))
                return ERR_CAST(pool);
  

diff --cc drivers/gpu/drm/i915/gt/intel_engine_types.h
index c5d1047a4bc5f482356ba5f87bc4ebf33d0c0d87,9dd8c299cb2dbb61989d81d6d233979d25192766..758f0e8ec6723dd8f0a89d987e9e0eb248f4e259
--- 1/drivers/gpu/drm/i915/gt/intel_engine_types.h
--- 2/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@@ -454,13 -473,15 +454,14 @@@ struct intel_engine_cs 
        /* status_notifier: list of callbacks for context-switch changes */
        struct atomic_notifier_head context_status_notifier;
  
- #define I915_ENGINE_NEEDS_CMD_PARSER BIT(0)
 -      struct intel_engine_hangcheck hangcheck;
 -
+ #define I915_ENGINE_USING_CMD_PARSER BIT(0)
  #define I915_ENGINE_SUPPORTS_STATS   BIT(1)
  #define I915_ENGINE_HAS_PREEMPTION   BIT(2)
  #define I915_ENGINE_HAS_SEMAPHORES   BIT(3)
  #define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(4)
  #define I915_ENGINE_IS_VIRTUAL       BIT(5)
 +#define I915_ENGINE_HAS_RELATIVE_MMIO BIT(6)
+ #define I915_ENGINE_REQUIRES_CMD_PARSER BIT(7)
        unsigned int flags;
  
        /*

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

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

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

diff --cc drivers/gpu/drm/i915/i915_reg.h
index ae306dab57fadcaece8fd7f6fdbd3fc1947598d5,f8ee9aba3955c54c89b2932ddc61bb524ae9c0c1..445dacbdc0e9efef7e31359f8f0a641f2750e367
--- 1/drivers/gpu/drm/i915/i915_reg.h
--- 2/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@@ -7353,8 -7217,10 +7357,12 @@@ enum 
  #define TGL_DMC_DEBUG_DC5_COUNT       _MMIO(0x101084)
  #define TGL_DMC_DEBUG_DC6_COUNT       _MMIO(0x101088)
  
 +#define DMC_DEBUG3            _MMIO(0x101090)
 +
+ /* Display Internal Timeout Register */
+ #define RM_TIMEOUT            _MMIO(0x42060)
+ #define  MMIO_TIMEOUT_US(us)  ((us) << 0)
+ 
  /* interrupts */
  #define DE_MASTER_IRQ_CONTROL   (1 << 31)
  #define DE_SPRITEB_FLIP_DONE    (1 << 29)

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