summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_mocs.h
diff options
context:
space:
mode:
authorDave Gordon <david.s.gordon@intel.com>2016-07-20 18:16:06 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-07-21 09:59:41 +0100
commit38a0f2db5b776246da35fe83c96f2c1ba87e4afa (patch)
treea45e025322cb3bea9efa32f62f32b736ec314b19 /drivers/gpu/drm/i915/intel_mocs.h
parentbbdc070a79b791bec0e374089bd0e7ecd949e6e8 (diff)
drm/i915: rename 'ring' where it refers to an engine or engine_id
'ring' is an old deprecated term for a GPU engine. Chris Wilson wants to use the name for what is currently known as an intel_ringbuffer, but it will be dreadfully confusing if some rings are ringbuffers but other rings are still engines. So this patch changes the names of a bunch of parameters called 'ring' to either 'engine' or 'engine_id' according to what they actually are. Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1469034967-15840-3-git-send-email-david.s.gordon@intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_mocs.h')
-rw-r--r--drivers/gpu/drm/i915/intel_mocs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_mocs.h b/drivers/gpu/drm/i915/intel_mocs.h
index 4640299e04ec..a8bd9f7bfece 100644
--- a/drivers/gpu/drm/i915/intel_mocs.h
+++ b/drivers/gpu/drm/i915/intel_mocs.h
@@ -54,6 +54,6 @@
int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req);
void intel_mocs_init_l3cc_table(struct drm_device *dev);
-int intel_mocs_init_engine(struct intel_engine_cs *ring);
+int intel_mocs_init_engine(struct intel_engine_cs *engine);
#endif