Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee42c00e authored Dec 11, 2017 by Chris Wilson

drm/i915: Bump timeout for wait_for_engines()

Extract the timeout we use in i915_gem_idle_work_handler() and reuse it
for wait_for_engines() in i915_gem_wait_for_idle(). It too has the same
problem in sometimes having to wait for an extended period before the HW
settles, so make use of the same timeout.

References: 5427f207 ("drm/i915: Bump wait-times for the final CS interrupt before parking")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171211194135.27095-1-chris@chris-wilson.co.uk

parent 1875fe7b

drivers/gpu/drm/i915/i915_drv.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1586,6 +1586,8 @@ struct drm_i915_error_state_buf {
		loff_t pos;
		};

		#define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */

		#define I915_RESET_TIMEOUT (10 * HZ) /* 10s */
		#define I915_FENCE_TIMEOUT (10 * HZ) /* 10s */

drivers/gpu/drm/i915/i915_gem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3333,7 +3333,7 @@ i915_gem_idle_work_handler(struct work_struct *work)
		* Wait for last execlists context complete, but bail out in case a
		* new request is submitted.
		*/
		end = ktime_add_ms(ktime_get(), 200);
		end = ktime_add_ms(ktime_get(), I915_IDLE_ENGINES_TIMEOUT);
		do {
		if (new_requests_since_last_retire(dev_priv))
		return;
		@@ -3533,7 +3533,7 @@ static int wait_for_timeline(struct i915_gem_timeline *tl, unsigned int flags)

		static int wait_for_engines(struct drm_i915_private *i915)
		{
		if (wait_for(intel_engines_are_idle(i915), 50)) {
		if (wait_for(intel_engines_are_idle(i915), I915_IDLE_ENGINES_TIMEOUT)) {
		DRM_ERROR("Failed to idle engines, declaring wedged!\n");
		i915_gem_set_wedged(i915);
		return -EIO;