[PATCH 43/74] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs
Chris Wilson
chris at chris-wilson.co.uk
Sat Apr 30 16:59:58 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 6ce4d22df575..69ee2fcd84c3 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2051,8 +2051,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;
@@ -2674,7 +2674,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
engine->scratch.gtt_offset = i915_gem_obj_ggtt_offset(obj);
}
- ret = intel_init_ring_buffer(dev, engine);
+ ret = intel_init_engine(dev, engine);
if (ret)
return ret;
@@ -2757,7 +2757,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);
}
/**
@@ -2791,7 +2791,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)
@@ -2849,7 +2849,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)
@@ -2901,7 +2901,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