summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-10-27 12:06:16 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2017-11-01 15:09:12 +0000
commit680273879d125d644831b8de42c66576e6290378 (patch)
treeaff4f1078ae3b9c089f37bf25dd7c28e075e2a6c /drivers/gpu/drm/i915/i915_gem.c
parente5330ac1f50b897d245753828e8887f297f69dd0 (diff)
drm/i915: Move parking-while-active warning to intel_engines_park()
We will want to break this down to give detailed per-engine warnings as to why we still think we are active as we attempt to park the engines. For the first step, just move the warning verbatim from the idle-worker to intel_engines_park(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20171027110617.31745-3-chris@chris-wilson.co.uk Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e43688f77817..9470ba0c1930 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3352,13 +3352,6 @@ i915_gem_idle_work_handler(struct work_struct *work)
*/
synchronize_irq(dev_priv->drm.irq);
- /*
- * We are committed now to parking the engines, make sure there
- * will be no more interrupts arriving later.
- */
- if (!intel_engines_are_idle(dev_priv))
- DRM_ERROR("Timeout waiting for engines to idle\n");
-
intel_engines_park(dev_priv);
i915_gem_timelines_mark_idle(dev_priv);