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: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4ef320c17b63ee214010a05eabd66e74535e8cce..727fc5448520908b473cef0088b883482725bc87 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1814,13 +1814,13 @@ 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,
-                                 struct intel_engine_cs *ring,
-                                 struct intel_context *ctx,
-                                 struct drm_i915_gem_execbuffer2 *args,
-                                 struct list_head *vmas,
-                                 struct drm_i915_gem_object *batch_obj,
-                                 u64 exec_start, u32 flags);
+               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,
+                                     struct list_head *vmas,
+                                     struct drm_i915_gem_object *batch_obj,
+                                     u64 exec_start, u32 flags);
                int (*init_rings)(struct drm_device *dev);
                void (*cleanup_ring)(struct intel_engine_cs *ring);
                void (*stop_ring)(struct intel_engine_cs *ring);

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3a9136584833862627d5544feb6c8e4432e36e49..815223694f329286eaa0ebe4f354ebfd11b71c89 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index a3190e793ed43744980bedba4ed42e1d0e38d597..2522f325e0e6d0d169dc71bce699df604baf8bb3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1601,9 +1601,9 @@ 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,
-                                     &eb->vmas, batch_obj, exec_start,
-                                     dispatch_flags);
+       ret = dev_priv->gt.execbuf_submit(dev, file, ring, ctx, args,
+                                         &eb->vmas, batch_obj, exec_start,
+                                         dispatch_flags);
 
        /*
         * FIXME: We crucially rely upon the active tracking for the (ppgtt)