From: Dave Gordon <[email protected]> Keep a local copy of the request pointer in the _final() functions rather than dereferencing the params block repeatedly.
v3: New patch in series. v6: Updated to newer nightly (lots of ring -> engine renaming). For: VIZ-1587 Signed-off-by: Dave Gordon <[email protected]> Signed-off-by: John Harrison <[email protected]> Reviewed-by: Jesse Barnes <[email protected]> --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 +++++++++-------- drivers/gpu/drm/i915/intel_lrc.c | 11 ++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 6e500bf..2b902e3 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1292,6 +1292,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) { struct drm_i915_private *dev_priv = to_i915(params->dev); + struct drm_i915_gem_request *req = params->request; struct intel_engine_cs *engine = params->engine; u64 exec_start, exec_len; int ret; @@ -1303,12 +1304,12 @@ int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) * Unconditionally invalidate gpu caches and ensure that we do flush * any residual writes from the previous batch. */ - ret = intel_ring_invalidate_all_caches(params->request); + ret = intel_ring_invalidate_all_caches(req); if (ret) return ret; /* Switch to the correct context for the batch */ - ret = i915_switch_context(params->request); + ret = i915_switch_context(req); if (ret) return ret; @@ -1317,7 +1318,7 @@ int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) if (engine == &dev_priv->engine[RCS] && params->instp_mode != dev_priv->relative_constants_mode) { - ret = intel_ring_begin(params->request, 4); + ret = intel_ring_begin(req, 4); if (ret) return ret; @@ -1331,7 +1332,7 @@ int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) } if (params->args_flags & I915_EXEC_GEN7_SOL_RESET) { - ret = i915_reset_gen7_sol_offsets(params->dev, params->request); + ret = i915_reset_gen7_sol_offsets(params->dev, req); if (ret) return ret; } @@ -1343,13 +1344,13 @@ int i915_gem_ringbuffer_submission_final(struct i915_execbuffer_params *params) if (exec_len == 0) exec_len = params->batch_obj->base.size; - ret = engine->dispatch_execbuffer(params->request, - exec_start, exec_len, - params->dispatch_flags); + ret = engine->dispatch_execbuffer(req, + exec_start, exec_len, + params->dispatch_flags); if (ret) return ret; - trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags); + trace_i915_gem_ring_dispatch(req, params->dispatch_flags); i915_gem_execbuffer_retire_commands(params); diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 6ac063d..69df948 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1005,7 +1005,8 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, int intel_execlists_submission_final(struct i915_execbuffer_params *params) { struct drm_i915_private *dev_priv = to_i915(params->dev); - struct intel_ringbuffer *ringbuf = params->request->ringbuf; + struct drm_i915_gem_request *req = params->request; + struct intel_ringbuffer *ringbuf = req->ringbuf; struct intel_engine_cs *engine = params->engine; u64 exec_start; int ret; @@ -1017,13 +1018,13 @@ int intel_execlists_submission_final(struct i915_execbuffer_params *params) * Unconditionally invalidate gpu caches and ensure that we do flush * any residual writes from the previous batch. */ - ret = logical_ring_invalidate_all_caches(params->request); + ret = logical_ring_invalidate_all_caches(req); if (ret) return ret; if (engine == &dev_priv->engine[RCS] && params->instp_mode != dev_priv->relative_constants_mode) { - ret = intel_logical_ring_begin(params->request, 4); + ret = intel_logical_ring_begin(req, 4); if (ret) return ret; @@ -1039,11 +1040,11 @@ int intel_execlists_submission_final(struct i915_execbuffer_params *params) exec_start = params->batch_obj_vm_offset + params->args_batch_start_offset; - ret = engine->emit_bb_start(params->request, exec_start, params->dispatch_flags); + ret = engine->emit_bb_start(req, exec_start, params->dispatch_flags); if (ret) return ret; - trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags); + trace_i915_gem_ring_dispatch(req, params->dispatch_flags); i915_gem_execbuffer_retire_commands(params); -- 1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
