From: Jani Nikula <jani.nikula@intel.com>
Date: Fri, 15 Nov 2019 11:17:39 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next-queued
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e205ceeb253723f4e4bdce619844ed678ae48276;p=linux.git

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>
---

e205ceeb253723f4e4bdce619844ed678ae48276
diff --cc drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index 69df5459c350a,3870dd5daaa09..c060bc428f49f
--- a/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__ */