On Thu, Mar 17, 2016 at 05:10:36PM +0000, Tvrtko Ursulin wrote: > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 3e40f7bf2147..ce7337b0aa14 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -159,7 +159,7 @@ struct intel_engine_cs { > unsigned int guc_id; > u32 mmio_base; > struct drm_device *dev; > - struct intel_ringbuffer *buffer; > + struct intel_ringbuffer *ring; > struct list_head buffers; I was thinking this should be legacy_ring for distinctness. It only actually gets referred to in a few places so shouldn't be too much of a nuisance (and mostly it is via local intel_ring). I did this in a few more steps trying to merge code as I went, but this should reduce the churn I have in a nice mechanical fashion, so from that perspective: Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx