Message ID | 1425563852-21349-1-git-send-email-John.C.Harrison@Intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 05/03/2015 13:57, 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. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 6 +++--- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 7c9e569..4e9a350 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1793,9 +1793,9 @@ struct drm_i915_private { > int (*alloc_request)(struct intel_engine_cs *ring, > struct intel_context *ctx, > struct drm_i915_gem_request **req_out); > - int (*do_execbuf)(struct i915_execbuffer_params *params, > - struct drm_i915_gem_execbuffer2 *args, > - struct list_head *vmas); > + int (*execbuf_submit)(struct i915_execbuffer_params *params, > + struct drm_i915_gem_execbuffer2 *args, > + struct list_head *vmas); > 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 ecff3f7..27abc9d 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4928,13 +4928,13 @@ int i915_gem_init(struct drm_device *dev) > > if (!i915.enable_execlists) { > dev_priv->gt.alloc_request = intel_ring_alloc_request; > - 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.alloc_request = intel_logical_ring_alloc_request; > - 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 dfad66a..d969eb5 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -1558,7 +1558,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, > params->batch_obj = batch_obj; > params->ctx = ctx; > > - ret = dev_priv->gt.do_execbuf(params, args, &eb->vmas); > + ret = dev_priv->gt.execbuf_submit(params, args, &eb->vmas); > > err: > /* > 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 7c9e569..4e9a350 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1793,9 +1793,9 @@ struct drm_i915_private { int (*alloc_request)(struct intel_engine_cs *ring, struct intel_context *ctx, struct drm_i915_gem_request **req_out); - int (*do_execbuf)(struct i915_execbuffer_params *params, - struct drm_i915_gem_execbuffer2 *args, - struct list_head *vmas); + int (*execbuf_submit)(struct i915_execbuffer_params *params, + struct drm_i915_gem_execbuffer2 *args, + struct list_head *vmas); 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 ecff3f7..27abc9d 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4928,13 +4928,13 @@ int i915_gem_init(struct drm_device *dev) if (!i915.enable_execlists) { dev_priv->gt.alloc_request = intel_ring_alloc_request; - 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.alloc_request = intel_logical_ring_alloc_request; - 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 dfad66a..d969eb5 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1558,7 +1558,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, params->batch_obj = batch_obj; params->ctx = ctx; - ret = dev_priv->gt.do_execbuf(params, args, &eb->vmas); + ret = dev_priv->gt.execbuf_submit(params, args, &eb->vmas); err: /*