Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/i915/intel_lrc.c

+5 −7
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params, 
	exec_start = params->batch_obj_vm_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)

		return ret;
@@ -1365,14 +1365,14 @@ static int gen9_init_render_ring(struct intel_engine_cs *ring) 
	return init_workarounds_ring(ring);

}



static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,

			      struct intel_context *ctx,

static int gen8_emit_bb_start(struct drm_i915_gem_request *req,

			      u64 offset, unsigned dispatch_flags)

{

	struct intel_ringbuffer *ringbuf = req->ringbuf;

	bool ppgtt = !(dispatch_flags & I915_DISPATCH_SECURE);

	int ret;



	ret = intel_logical_ring_begin(ringbuf, ctx, 4);

	ret = intel_logical_ring_begin(ringbuf, req->ctx, 4);

	if (ret)

		return ret;
@@ -1582,9 +1582,7 @@ static int intel_lr_context_render_state_init(struct drm_i915_gem_request *req) 
	if (so.rodata == NULL)

		return 0;



	ret = req->ring->emit_bb_start(req->ringbuf,

				       req->ctx,

				       so.ggtt_offset,

	ret = req->ring->emit_bb_start(req, so.ggtt_offset,

				       I915_DISPATCH_SECURE);

	if (ret)

		goto out;

drivers/gpu/drm/i915/intel_ringbuffer.h

+1 −2
Original line number Diff line number Diff line
@@ -270,8 +270,7 @@ struct intel_engine_cs { 
	int		(*emit_flush)(struct drm_i915_gem_request *request,

				      u32 invalidate_domains,

				      u32 flush_domains);

	int		(*emit_bb_start)(struct intel_ringbuffer *ringbuf,

					 struct intel_context *ctx,

	int		(*emit_bb_start)(struct drm_i915_gem_request *req,

					 u64 offset, unsigned dispatch_flags);



	/**