aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_mocs.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-08-02 17:50:21 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2016-08-02 17:58:16 -0400
commit7e37f889b50e798fc17f74e561b06a8715bee5a2 (patch)
tree7c8e689976c32105137dcacb6a2e2cdc6aaf651a /drivers/gpu/drm/i915/intel_mocs.c
parentdca33ecc5f1e5542b3f2fa2911b92f743369d367 (diff)
drm/i915: Rename struct intel_ringbuffer to struct intel_ring
The state stored in this struct is not only the information about the buffer object, but the ring used to communicate with the hardware. Using buffer here is overly specific and, for me at least, conflates with the notion of buffer objects themselves. s/struct intel_ringbuffer/struct intel_ring/ s/enum intel_ring_hangcheck/enum intel_engine_hangcheck/ s/describe_ctx_ringbuf()/describe_ctx_ring()/ s/intel_ring_get_active_head()/intel_engine_get_active_head()/ s/intel_ring_sync_index()/intel_engine_sync_index()/ s/intel_ring_init_seqno()/intel_engine_init_seqno()/ s/ring_stuck()/engine_stuck()/ s/intel_cleanup_engine()/intel_engine_cleanup()/ s/intel_stop_engine()/intel_engine_stop()/ s/intel_pin_and_map_ringbuffer_obj()/intel_pin_and_map_ring()/ s/intel_unpin_ringbuffer()/intel_unpin_ring()/ s/intel_engine_create_ringbuffer()/intel_engine_create_ring()/ s/intel_ring_flush_all_caches()/intel_engine_flush_all_caches()/ s/intel_ring_invalidate_all_caches()/intel_engine_invalidate_all_caches()/ s/intel_ringbuffer_free()/intel_ring_free()/ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-15-git-send-email-chris@chris-wilson.co.uk Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-4-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_mocs.c')
-rw-r--r--drivers/gpu/drm/i915/intel_mocs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
index 8534ec3648bd..80bb9247ce66 100644
--- a/drivers/gpu/drm/i915/intel_mocs.c
+++ b/drivers/gpu/drm/i915/intel_mocs.c
@@ -276,7 +276,7 @@ int intel_mocs_init_engine(struct intel_engine_cs *engine)
276static int emit_mocs_control_table(struct drm_i915_gem_request *req, 276static int emit_mocs_control_table(struct drm_i915_gem_request *req,
277 const struct drm_i915_mocs_table *table) 277 const struct drm_i915_mocs_table *table)
278{ 278{
279 struct intel_ringbuffer *ring = req->ring; 279 struct intel_ring *ring = req->ring;
280 enum intel_engine_id engine = req->engine->id; 280 enum intel_engine_id engine = req->engine->id;
281 unsigned int index; 281 unsigned int index;
282 int ret; 282 int ret;
@@ -336,7 +336,7 @@ static inline u32 l3cc_combine(const struct drm_i915_mocs_table *table,
336static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req, 336static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,
337 const struct drm_i915_mocs_table *table) 337 const struct drm_i915_mocs_table *table)
338{ 338{
339 struct intel_ringbuffer *ring = req->ring; 339 struct intel_ring *ring = req->ring;
340 unsigned int i; 340 unsigned int i;
341 int ret; 341 int ret;
342 342