drm/i915: introduce for_each_engine_id()

Equivalent to the existing for_each_engine() macro, this will replace
the latter wherever the third argument *is* actually wanted (in most
places, it is not used). The third argument is renamed to emphasise
that it is an engine id (type enum intel_engine_id). All the callers of
the macro that actually need the third argument are updated to use this
version, and the argument (generally 'i') is also updated to be 'id'.
Other callers (where the third argument is unused) are untouched for
now; they will be updated in the next patch.

Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
index 3c725dde16ed..7c7ac0aa192a 100644
--- a/drivers/gpu/drm/i915/intel_mocs.c
+++ b/drivers/gpu/drm/i915/intel_mocs.c
@@ -325,11 +325,11 @@ int intel_rcs_context_init_mocs(struct drm_i915_gem_request *req)
         if (get_mocs_settings(req->engine->dev, &t)) {
                 struct drm_i915_private *dev_priv = req->i915;
                 struct intel_engine_cs *engine;
-                enum intel_engine_id ring_id;
+                enum intel_engine_id id;
 
                 /* Program the control registers */
-                for_each_engine(engine, dev_priv, ring_id) {
-                        ret = emit_mocs_control_table(req, &t, ring_id);
+                for_each_engine_id(engine, dev_priv, id) {
+                        ret = emit_mocs_control_table(req, &t, id);
                         if (ret)
                                 return ret;
                 }