Commit be795fc1 authored by John Harrison's avatar John Harrison Committed by Daniel Vetter

drm/i915: Update ring->emit_bb_start() to take a request structure

Updated the ring->emit_bb_start() implementation to take a request instead of a
ringbuf/context pair.

For: VIZ-5115
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarTomas Elf <tomas.elf@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 53fddaf7
...@@ -936,7 +936,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, ...@@ -936,7 +936,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,
exec_start = params->batch_obj_vm_offset + exec_start = params->batch_obj_vm_offset +
args->batch_start_offset; args->batch_start_offset;
ret = ring->emit_bb_start(ringbuf, params->ctx, exec_start, params->dispatch_flags); ret = ring->emit_bb_start(params->request, exec_start, params->dispatch_flags);
if (ret) if (ret)
return ret; return ret;
...@@ -1365,14 +1365,14 @@ static int gen9_init_render_ring(struct intel_engine_cs *ring) ...@@ -1365,14 +1365,14 @@ static int gen9_init_render_ring(struct intel_engine_cs *ring)
return init_workarounds_ring(ring); return init_workarounds_ring(ring);
} }
static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf, static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
struct intel_context *ctx,
u64 offset, unsigned dispatch_flags) u64 offset, unsigned dispatch_flags)
{ {
struct intel_ringbuffer *ringbuf = req->ringbuf;
bool ppgtt = !(dispatch_flags & I915_DISPATCH_SECURE); bool ppgtt = !(dispatch_flags & I915_DISPATCH_SECURE);
int ret; int ret;
ret = intel_logical_ring_begin(ringbuf, ctx, 4); ret = intel_logical_ring_begin(ringbuf, req->ctx, 4);
if (ret) if (ret)
return ret; return ret;
...@@ -1582,9 +1582,7 @@ static int intel_lr_context_render_state_init(struct drm_i915_gem_request *req) ...@@ -1582,9 +1582,7 @@ static int intel_lr_context_render_state_init(struct drm_i915_gem_request *req)
if (so.rodata == NULL) if (so.rodata == NULL)
return 0; return 0;
ret = req->ring->emit_bb_start(req->ringbuf, ret = req->ring->emit_bb_start(req, so.ggtt_offset,
req->ctx,
so.ggtt_offset,
I915_DISPATCH_SECURE); I915_DISPATCH_SECURE);
if (ret) if (ret)
goto out; goto out;
......
...@@ -270,8 +270,7 @@ struct intel_engine_cs { ...@@ -270,8 +270,7 @@ struct intel_engine_cs {
int (*emit_flush)(struct drm_i915_gem_request *request, int (*emit_flush)(struct drm_i915_gem_request *request,
u32 invalidate_domains, u32 invalidate_domains,
u32 flush_domains); u32 flush_domains);
int (*emit_bb_start)(struct intel_ringbuffer *ringbuf, int (*emit_bb_start)(struct drm_i915_gem_request *req,
struct intel_context *ctx,
u64 offset, unsigned dispatch_flags); u64 offset, unsigned dispatch_flags);
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment