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>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e43688f77817269781f96263943b40880b4a2e3a..9470ba0c1930ebe141c370ec556b8dac8671c834 100644 (file)
--- 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);
 

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index f31f2d6384c35dbf570c80281c891705293bacde..9767586e22898bc302217899209b0af64e2e467e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1613,6 +1613,13 @@ void intel_engines_park(struct drm_i915_private *i915)
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
 
+       /*
+        * 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");
+
        for_each_engine(engine, i915, id) {
                if (engine->park)
                        engine->park(engine);