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

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

drm/i915: Rename 'do_execbuf' to 'execbuf_submit' 



The submission portion of the execbuffer code path was abstracted into a
function pointer indirection as part of the legacy vs execlist work. The two
implementation functions are called 'i915_gem_ringbuffer_submission' and
'intel_execlists_submission' but the pointer was called 'do_execbuf'. There is
already a 'i915_gem_do_execbuffer' function (which is what calls the pointer
indirection). The name of the pointer is therefore considered to be backwards
and should be changed.

This patch renames it to 'execbuf_submit' which is hopefully a bit clearer.

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 1652d19e

drivers/gpu/drm/i915/i915_drv.h

+7 −7
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ struct drm_i915_private { 


	/* Abstract the submission mechanism (legacy ringbuffer or execlists) away */

	struct {

		int (*do_execbuf)(struct drm_device *dev, struct drm_file *file,

		int (*execbuf_submit)(struct drm_device *dev, struct drm_file *file,

				      struct intel_engine_cs *ring,

				      struct intel_context *ctx,

				      struct drm_i915_gem_execbuffer2 *args,

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -4859,12 +4859,12 @@ int i915_gem_init(struct drm_device *dev) 
	}



	if (!i915.enable_execlists) {

		dev_priv->gt.do_execbuf = i915_gem_ringbuffer_submission;

		dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission;

		dev_priv->gt.init_rings = i915_gem_init_rings;

		dev_priv->gt.cleanup_ring = intel_cleanup_ring_buffer;

		dev_priv->gt.stop_ring = intel_stop_ring_buffer;

	} else {

		dev_priv->gt.do_execbuf = intel_execlists_submission;

		dev_priv->gt.execbuf_submit = intel_execlists_submission;

		dev_priv->gt.init_rings = intel_logical_rings_init;

		dev_priv->gt.cleanup_ring = intel_logical_ring_cleanup;

		dev_priv->gt.stop_ring = intel_logical_ring_stop;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −3
Original line number Diff line number Diff line
@@ -1601,7 +1601,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	} else

		exec_start += i915_gem_obj_offset(batch_obj, vm);



	ret = dev_priv->gt.do_execbuf(dev, file, ring, ctx, args,

	ret = dev_priv->gt.execbuf_submit(dev, file, ring, ctx, args,

					  &eb->vmas, batch_obj, exec_start,

					  dispatch_flags);