Merge drm/drm-next into drm-intel-next-queued

Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/Kconfig.debug
Simple merge

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

diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.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_context_types.h
index 69df5459c350ab50aeac482e529aa9e989aec859,3870dd5daaa099bc372b11b51a46b4db630e1e20..c060bc428f49fedfc64a4285394ecf459af98265
--- 1/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
--- 2/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@@ -168,14 -177,12 +168,21 @@@ struct i915_gem_context 
         */
        struct radix_tree_root handles_vma;
  
+       /** jump_whitelist: Bit array for tracking cmds during cmdparsing
+        *  Guarded by struct_mutex
+        */
+       unsigned long *jump_whitelist;
+       /** jump_whitelist_cmds: No of cmd slots available */
+       u32 jump_whitelist_cmds;
++
 +      /**
 +       * @name: arbitrary name, used for user debug
 +       *
 +       * A name is constructed for the context from the creator's process
 +       * name, pid and user handle in order to uniquely identify the
 +       * context in messages.
 +       */
 +      char name[TASK_COMM_LEN + 8];
  };
  
  #endif /* __I915_GEM_CONTEXT_TYPES_H__ */

diff --cc drivers/gpu/drm/i915/gt/intel_rc6.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_gem.c
Simple merge

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

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