iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Remove vestigal i915_gem_context locals from cmdparser

Browse Source 
The use GEM context itself was removed in commit cd30a5031704
("drm/i915/gem: Excise the per-batch whitelist from the context"), but
the locals were left in place as an oversight. Remove the parameters and
clean up.

References: cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191204232616.94397-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-12-04 23:26:16 +00:00
parent 126d5de385
commit 05975cd9eb
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View File

@ -2022,8 +2022,7 @@ static struct i915_vma *eb_parse(struct i915_execbuffer *eb)
shadow_batch_start = gen8_canonical_addr(vma->node.start); shadow_batch_start = gen8_canonical_addr(vma->node.start);
err = intel_engine_cmd_parser(eb->gem_context, err = intel_engine_cmd_parser(eb->engine,
eb->engine,
eb->batch->obj, eb->batch->obj,
batch_start, batch_start,
eb->batch_start_offset, eb->batch_start_offset,

11
drivers/gpu/drm/i915/i915_cmd_parser.c
View File

@ -1306,8 +1306,7 @@ static bool check_cmd(const struct intel_engine_cs *engine,
return true; return true;
} }
static int check_bbstart(const struct i915_gem_context *ctx, static int check_bbstart(u32 *cmd, u32 offset, u32 length,
u32 *cmd, u32 offset, u32 length,
u32 batch_len, u32 batch_len,
u64 batch_start, u64 batch_start,
u64 shadow_batch_start, u64 shadow_batch_start,
@ -1392,7 +1391,6 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
/** /**
* i915_parse_cmds() - parse a submitted batch buffer for privilege violations * i915_parse_cmds() - parse a submitted batch buffer for privilege violations
* @ctx: the context in which the batch is to execute
* @engine: the engine on which the batch is to execute * @engine: the engine on which the batch is to execute
* @batch_obj: the batch buffer in question * @batch_obj: the batch buffer in question
* @batch_start: Canonical base address of batch * @batch_start: Canonical base address of batch
@ -1408,8 +1406,7 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
* if the batch appears legal but should use hardware parsing * if the batch appears legal but should use hardware parsing
*/ */
int intel_engine_cmd_parser(struct i915_gem_context *ctx, int intel_engine_cmd_parser(struct intel_engine_cs *engine,
struct intel_engine_cs *engine,
struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *batch_obj,
u64 batch_start, u64 batch_start,
u32 batch_start_offset, u32 batch_start_offset,
@ -1433,7 +1430,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
} }
/* Defer failure until attempted use */ /* Defer failure until attempted use */
jump_whitelist = alloc_whitelist(ctx->i915, batch_len); jump_whitelist = alloc_whitelist(engine->i915, batch_len);
/* /*
* We use the batch length as size because the shadow object is as * We use the batch length as size because the shadow object is as
@ -1475,7 +1472,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
} }
if (desc->cmd.value == MI_BATCH_BUFFER_START) { if (desc->cmd.value == MI_BATCH_BUFFER_START) {
ret = check_bbstart(ctx, cmd, offset, length, ret = check_bbstart(cmd, offset, length,
batch_len, batch_start, batch_len, batch_start,
shadow_batch_start, shadow_batch_start,
jump_whitelist); jump_whitelist);

3
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1947,8 +1947,7 @@ 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 i915_cmd_parser_get_version(struct drm_i915_private *dev_priv);
void intel_engine_init_cmd_parser(struct intel_engine_cs *engine); void intel_engine_init_cmd_parser(struct intel_engine_cs *engine);
void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine); void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine);
int intel_engine_cmd_parser(struct i915_gem_context *cxt, int intel_engine_cmd_parser(struct intel_engine_cs *engine,
struct intel_engine_cs *engine,
struct drm_i915_gem_object *batch_obj, struct drm_i915_gem_object *batch_obj,
u64 user_batch_start, u64 user_batch_start,
u32 batch_start_offset, u32 batch_start_offset,