]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm/i915: Update a couple of hangcheck comments to talk about engines
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 27 Jul 2016 08:07:30 +0000 (09:07 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 27 Jul 2016 15:23:05 +0000 (16:23 +0100)
We still have lots of comments that refer to the old ring when we mean
struct intel_engine_cs and its hardware correspondence. This patch fixes
an instance inside hangcheck to talk about engines.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-10-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469606850-28659-5-git-send-email-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_irq.c

index 7104dc1463eb3a43125a593ab7042e69919d2650..f5bf4f913a91c0234123eccca397923d1bcbb67a 100644 (file)
@@ -3140,13 +3140,13 @@ static void i915_hangcheck_elapsed(struct work_struct *work)
                                }
                        } else {
                                /* We always increment the hangcheck score
-                                * if the ring is busy and still processing
+                                * if the engine is busy and still processing
                                 * the same request, so that no single request
                                 * can run indefinitely (such as a chain of
                                 * batches). The only time we do not increment
                                 * the hangcheck score on this ring, if this
-                                * ring is in a legitimate wait for another
-                                * ring. In that case the waiting ring is a
+                                * engine is in a legitimate wait for another
+                                * engine. In that case the waiting engine is a
                                 * victim and we want to be sure we catch the
                                 * right culprit. Then every time we do kick
                                 * the ring, add a small increment to the