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

Commit 676fa572 authored Dec 24, 2014 by Chris Wilson Committed by Daniel Vetter Jan 07, 2015

drm/i915: Move the ban period onto the context



This will allow us to set per-file, or even per-context, periods in the
future.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 90254523

drivers/gpu/drm/i915/i915_drv.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -678,6 +678,11 @@ struct i915_ctx_hang_stats {
		/* Time when this context was last blamed for a GPU reset */
		unsigned long guilty_ts;

		/* If the contexts causes a second GPU hang within this time,
		* it is permanently banned from submitting any more work.
		*/
		unsigned long ban_period_seconds;

		/* This context is banned to submit more work */
		bool banned;
		};

drivers/gpu/drm/i915/i915_gem.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2535,7 +2535,8 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
		if (ctx->hang_stats.banned)
		return true;

		if (elapsed <= DRM_I915_CTX_BAN_PERIOD) {
		if (ctx->hang_stats.ban_period_seconds &&
		elapsed <= ctx->hang_stats.ban_period_seconds) {
		if (!i915_gem_context_is_default(ctx)) {
		DRM_DEBUG("context hanging too fast, banning!\n");
		return true;

drivers/gpu/drm/i915/i915_gem_context.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,8 @@ __create_hw_context(struct drm_device *dev,
		* is no remap info, it will be a NOP. */
		ctx->remap_slice = (1 << NUM_L3_SLICES(dev)) - 1;

		ctx->hang_stats.ban_period_seconds = DRM_I915_CTX_BAN_PERIOD;

		return ctx;

		err_out: