drm/i915: Do not keep postponing the idle-work
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Jul 2016 07:08:32 +0000 (08:08 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Jul 2016 07:18:20 +0000 (08:18 +0100)
Rather than persistently postponing the idle-work everytime somebody
calls i915_gem_retire_requests() (potentially ensuring that we never
reach the idle state), queue the work the first time we detect all
requests are complete. Then if in 100ms, more requests have been queued,
we will abort the idle-worker and wait again until all the new requests
have been completed.

Of course, this does depend upon the idle worker cancelling itself
gracefully from the previous patch.

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/1467616119-4093-2-git-send-email-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_gem.c

index 133060c0f96f86abc10b7fae4abf1ad3ee17dcc2..78057fafd4bc36f8f0988735733bcc3ef4efc8b6 100644 (file)
@@ -3255,9 +3255,9 @@ void i915_gem_retire_requests(struct drm_i915_private *dev_priv)
        }
 
        if (dev_priv->gt.active_engines == 0)
-               mod_delayed_work(dev_priv->wq,
-                                &dev_priv->gt.idle_work,
-                                msecs_to_jiffies(100));
+               queue_delayed_work(dev_priv->wq,
+                                  &dev_priv->gt.idle_work,
+                                  msecs_to_jiffies(100));
 }
 
 static void