[PATCH 46/78] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs
Chris Wilson
chris at chris-wilson.co.uk
Sat May 7 17:42:33 UTC 2016
Having ringbuf->ring point to an engine is confusing, so rename it once
again to ring->engine.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index a2741490ff35..f54a0ac3ade1 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2036,8 +2036,8 @@ intel_ringbuffer_free(struct intel_ringbuffer *ring)
kfree(ring);
}
-static int intel_init_ring_buffer(struct drm_device *dev,
- struct intel_engine_cs *engine)
+static int intel_init_engine(struct drm_device *dev,
+ struct intel_engine_cs *engine)
{
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_ringbuffer *ringbuf;
@@ -2640,7 +2640,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
engine->init_hw = init_render_ring;
engine->cleanup = render_ring_cleanup;
- ret = intel_init_ring_buffer(dev, engine);
+ ret = intel_init_engine(dev, engine);
if (ret)
return ret;
@@ -2727,7 +2727,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
}
engine->init_hw = init_ring_common;
- return intel_init_ring_buffer(dev, engine);
+ return intel_init_engine(dev, engine);
}
/**
@@ -2761,7 +2761,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)
}
engine->init_hw = init_ring_common;
- return intel_init_ring_buffer(dev, engine);
+ return intel_init_engine(dev, engine);
}
int intel_init_blt_ring_buffer(struct drm_device *dev)
@@ -2819,7 +2819,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
}
engine->init_hw = init_ring_common;
- return intel_init_ring_buffer(dev, engine);
+ return intel_init_engine(dev, engine);
}
int intel_init_vebox_ring_buffer(struct drm_device *dev)
@@ -2871,7 +2871,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
}
engine->init_hw = init_ring_common;
- return intel_init_ring_buffer(dev, engine);
+ return intel_init_engine(dev, engine);
}
int
--
2.8.1
More information about the Intel-gfx-trybot
mailing list