This function should not be called with long timeouts in atomic context. Annotate it as might_sleep if timeout is longer than 10us. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> Suggested-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/intel_uncore.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 1deb1a4..9cc9e6f 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1606,6 +1606,9 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv, * wish to wait without holding forcewake for the duration (i.e. you expect * the wait to be slow). * + * Only @fast_timeout_us < 10us are allowed in atomic context. + * Note that @fast_timeout_us >= 50000us are not allowed at all. + * * Returns 0 if the register matches the desired condition, or -ETIMEOUT. */ int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv, @@ -1620,6 +1623,9 @@ int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv, #define done (((reg_value = I915_READ_FW(reg)) & mask) == value) int ret; + /* Catch any overuse of this function */ + might_sleep_if(fast_timeout_us > 10 || slow_timeout_ms); + if (fast_timeout_us > 10) ret = _wait_for(done, fast_timeout_us, 10); else -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
