--- drivers/gpu/drm/i915/i915_gem.c.orig 2022-02-23 13:59:52 UTC +++ drivers/gpu/drm/i915/i915_gem.c @@ -934,18 +934,28 @@ wait_for_timelines(struct drm_i915_private *i915, int i915_gem_wait_for_idle(struct drm_i915_private *i915, unsigned int flags, long timeout) { + long start = ticks; + printf("\nStart of i915_gem_wait_for_idle()\n"); /* If the device is asleep, we have no requests outstanding */ if (!intel_gt_pm_is_awake(&i915->gt)) return 0; - GEM_TRACE("flags=%x (%s), timeout=%ld%s\n", + printf("flags=%x (%s), timeout=%ld%s\n", flags, flags & I915_WAIT_LOCKED ? "locked" : "unlocked", timeout, timeout == MAX_SCHEDULE_TIMEOUT ? " (forever)" : ""); - timeout = wait_for_timelines(i915, flags, timeout); + printf("\nCalling wait_for_timelines()\n"); + //timeout = wait_for_timelines(i915, flags, timeout); + timeout = wait_for_timelines(i915, flags, MAX_SCHEDULE_TIMEOUT); + + printf("flags=%x (%s), timeout=%ld%s\n", + flags, flags & I915_WAIT_LOCKED ? "locked" : "unlocked", + timeout, timeout == MAX_SCHEDULE_TIMEOUT ? " (forever)" : ""); + if (timeout < 0) return timeout; + printf("\nEnd of i915_gem_wait_for_idle() in %ld tick(s)\n", ticks - start); if (flags & I915_WAIT_LOCKED) { lockdep_assert_held(&i915->drm.struct_mutex);