On ma, 2016-07-25 at 08:44 +0100, Chris Wilson wrote: > Having ringbuf->ring point to an engine is confusing, so rename it once > again to ring->engine. > > Signed-off-by: Chris Wilson <[email protected]>
I still do not see a connection between commit message and content, so you could mentione renaming the function (which is all this patch does). For code, Reviewed-by: Joonas Lahtinen <[email protected]> > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c > b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 7ba31724feaf..c4582b9a6862 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2186,7 +2186,7 @@ static void intel_ring_context_unpin(struct > i915_gem_context *ctx, > i915_gem_context_put(ctx); > } > > -static int intel_init_ring_buffer(struct intel_engine_cs *engine) > +static int intel_init_engine(struct intel_engine_cs *engine) > { > struct drm_i915_private *dev_priv = engine->i915; > struct intel_ringbuffer *ringbuf; > @@ -2883,7 +2883,7 @@ int intel_init_render_ring_buffer(struct > intel_engine_cs *engine) > engine->init_hw = init_render_ring; > engine->cleanup = render_ring_cleanup; > > - ret = intel_init_ring_buffer(engine); > + ret = intel_init_engine(engine); > if (ret) > return ret; > > @@ -2922,7 +2922,7 @@ int intel_init_bsd_ring_buffer(struct intel_engine_cs > *engine) > engine->irq_enable_mask = I915_BSD_USER_INTERRUPT; > } > > - return intel_init_ring_buffer(engine); > + return intel_init_engine(engine); > } > > /** > @@ -2936,7 +2936,7 @@ int intel_init_bsd2_ring_buffer(struct intel_engine_cs > *engine) > > engine->flush = gen6_bsd_ring_flush; > > - return intel_init_ring_buffer(engine); > + return intel_init_engine(engine); > } > > int intel_init_blt_ring_buffer(struct intel_engine_cs *engine) > @@ -2949,7 +2949,7 @@ int intel_init_blt_ring_buffer(struct intel_engine_cs > *engine) > if (INTEL_GEN(dev_priv) < 8) > engine->irq_enable_mask = GT_BLT_USER_INTERRUPT; > > - return intel_init_ring_buffer(engine); > + return intel_init_engine(engine); > } > > int intel_init_vebox_ring_buffer(struct intel_engine_cs *engine) > @@ -2966,7 +2966,7 @@ int intel_init_vebox_ring_buffer(struct intel_engine_cs > *engine) > engine->irq_disable = hsw_vebox_irq_disable; > } > > - return intel_init_ring_buffer(engine); > + return intel_init_engine(engine); > } > > int -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
