diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-14 11:06:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-14 11:09:06 +1000 |
| commit | dfce90259d74d34cff4cb0c75ecfc0336c09520f (patch) | |
| tree | e13b4f5083043a15d53c096d924d21cc57b45b59 /drivers/gpu/drm/i915/gem/i915_gem_context_types.h | |
| parent | 2248a28384fedb84d1d068383bbec113cc4ce0fe (diff) | |
| parent | ea0b163b13ffc52818c079adb00d55e227a6da6f (diff) | |
Backmerge i915 security patches from commit 'ea0b163b13ff' 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>
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_context_types.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h index 861d7d92fe9f..3870dd5daaa0 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h @@ -176,6 +176,13 @@ struct i915_gem_context { * per vm, which may be one per context or shared with the global GTT) */ 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; }; #endif /* __I915_GEM_CONTEXT_TYPES_H__ */ |