drm/i915: Refactor execlists default context pinning

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem_debug.c

diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c
index 17299d04189fcc91b30b703787174914681bcdbf..a5651648239457a66d83d01fc1064b74d5a0aac0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_debug.c
+++ b/drivers/gpu/drm/i915/i915_gem_debug.c
@@ -36,29 +36,29 @@ i915_verify_lists(struct drm_device *dev)
        static int warned;
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct drm_i915_gem_object *obj;
-       struct intel_engine_cs *ring;
+       struct intel_engine_cs *engine;
        int err = 0;
-       int i;
 
        if (warned)
                return 0;
 
-       for_each_ring(ring, dev_priv, i) {
-               list_for_each_entry(obj, &ring->active_list, ring_list[ring->id]) {
+       for_each_engine(engine, dev_priv) {
+               list_for_each_entry(obj, &engine->active_list,
+                                   engine_list[engine->id]) {
                        if (obj->base.dev != dev ||
                            !atomic_read(&obj->base.refcount.refcount)) {
                                DRM_ERROR("%s: freed active obj %p\n",
-                                         ring->name, obj);
+                                         engine->name, obj);
                                err++;
                                break;
                        } else if (!obj->active ||
-                                  obj->last_read_req[ring->id] == NULL) {
+                                  obj->last_read_req[engine->id] == NULL) {
                                DRM_ERROR("%s: invalid active obj %p\n",
-                                         ring->name, obj);
+                                         engine->name, obj);
                                err++;
                        } else if (obj->base.write_domain) {
                                DRM_ERROR("%s: invalid write obj %p (w %x)\n",
-                                         ring->name,
+                                         engine->name,
                                          obj, obj->base.write_domain);
                                err++;
                        }