| Message ID | 1426768264-16996-2-git-send-email-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19/03/2015 12:30, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > 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> > --- > drivers/gpu/drm/i915/i915_drv.h | 14 +++++++------- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++--- > 3 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index eb38cd1..1a23445 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1812,13 +1812,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 092f25c..51cdfb7 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4837,12 +4837,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 9838d11..38e2178 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -1594,9 +1594,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) > Reviewed-by: Tomas Elf <tomas.elf@intel.com> Thanks, Tomas
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index eb38cd1..1a23445 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1812,13 +1812,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 092f25c..51cdfb7 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4837,12 +4837,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 9838d11..38e2178 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1594,9 +1594,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)