diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 6cb8e3ed97e4d9098c6afa6f35f8f3698c011ac9..87778f03393b3e09225402efbebd3ab15aacca4e 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1626,11 +1626,12 @@ void intel_engines_park(struct drm_i915_private *i915)
 		 * will be no more interrupts arriving later and the engines
 		 * are truly idle.
 		 */
-		if (!intel_engine_is_idle(engine)) {
+		if (wait_for(intel_engine_is_idle(engine), 10)) {
 			struct drm_printer p = drm_debug_printer(__func__);
 
-			DRM_ERROR("%s is not idle before parking\n",
-				  engine->name);
+			dev_err(i915->drm.dev,
+				"%s is not idle before parking\n",
+				engine->name);
 			intel_engine_dump(engine, &p);
 		}