Re: [PATCH] drm/i915: Convert stray struct intel_engine_cs *ring

Dave Gordon
2016-07-27T13:16:08Z

On 20/07/16 16:00, Chris Wilson wrote:
> We still have a few uses of the identifier "ring" used when referring to
> the struct intel_engine_cs (a remanent from when there was only one dual
> purpose engine/ringbuffer). Rename all of this to use the familiar
> engine so that the separation between the hardware engine and the
> ringbuffer containing the commands is clear.
>
> This patch was formed by searching for instances of '\<ring\>' and
> changing those found to be referring to an engine. There are quite a few
> instances in comments remaining where it is less clear what is
> appropriate for the context, the registers still refer to ring (there we
> need to check against bspec for any counter-recommendations, but quite a
> few registers, like PDP should be engine based, whereas RING_HEAD
> probably wants to remain as ring based) and the biggest compromise was
> in error capture where we already have a local engine variable and so
> finding a good name was trickier.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Dave Gordon <david.s.gordon@intel.com>
> ---
> drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +-
> drivers/gpu/drm/i915/i915_drv.h | 15 +-
> drivers/gpu/drm/i915/i915_gem.c | 26 +--
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 23 +--
> drivers/gpu/drm/i915/i915_gpu_error.c | 255 +++++++++++++++--------------
> drivers/gpu/drm/i915/i915_irq.c | 6 +-
> drivers/gpu/drm/i915/intel_mocs.h | 2 +-
> drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
> drivers/gpu/drm/i915/intel_ringbuffer.h | 24 +--
> 9 files changed, 183 insertions(+), 174 deletions(-)

I ran my generic Cocci-script for renaming things over the before and
after versions and it didn't find any you'd missed, so:

Reviewed-by: Dave Gordon <david.s.gordon@intel.com>