From 62e6300768f6550ba24fa3ba2d4c66d725e3c890 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 24 Jun 2016 14:55:52 +0100 Subject: [PATCH] drm/i915: Skip idling an idle engine During suspend (or module unload), if we have never accessed the engine (i.e. userspace never submitted a batch to it), the engine is idle. Then we attempt to idle the engine by forcing it to the default context, which actually means we submit a render batch to setup the golden context state and then wait for it to complete. We can skip this entirely as we know the engine is idle. v2: Drop incorrect comment. References: https://bugs.freedesktop.org/show_bug.cgi?id=95634 Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen Link: http://patchwork.freedesktop.org/patch/msgid/1466776558-21516-1-git-send-email-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/i915_gem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6abd5e5..a0533ca 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3677,8 +3677,10 @@ int i915_gpu_idle(struct drm_device *dev) struct intel_engine_cs *engine; int ret; - /* Flush everything onto the inactive list. */ for_each_engine(engine, dev_priv) { + if (engine->last_context == NULL) + continue; + if (!i915.enable_execlists) { struct drm_i915_gem_request *req; -- 2.7.4