diff options
| author |   Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
| commit | 35482f9dc56b9bd0f179106da7e461f6c2a2d891 (patch) | |
| tree | b04c95e464c3724b5b5b0ba50ad4a26886b2497a /drivers/gpu/drm/i915/i915_drv.h | |
| parent | Merge tag 'drm-misc-next-2021-07-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Linux 5.14-rc3 (diff) | |
| download | linux-dev-35482f9dc56b9bd0f179106da7e461f6c2a2d891.tar.xz linux-dev-35482f9dc56b9bd0f179106da7e461f6c2a2d891.zip | |
Backmerge tag 'v5.14-rc3' into drm-next
Linux 5.14-rc3
Daniel said we should pull the nouveau fix from fixes in here, probably
a good plan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fd9db6de5113..997fbe9532c1 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1897,17 +1897,12 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type); int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv); int intel_engine_init_cmd_parser(struct intel_engine_cs *engine); void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine); -unsigned long *intel_engine_cmd_parser_alloc_jump_whitelist(u32 batch_length, - bool trampoline); - int intel_engine_cmd_parser(struct intel_engine_cs *engine, struct i915_vma *batch, unsigned long batch_offset, unsigned long batch_length, struct i915_vma *shadow, - unsigned long *jump_whitelist, - void *shadow_map, - const void *batch_map); + bool trampoline); #define I915_CMD_PARSER_TRAMPOLINE_SIZE 8 /* intel_device_info.c */ |