mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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>
This commit is contained in:
parent
9025452366
commit
676fa5721c
3 changed files with 9 additions and 1 deletions
|
@ -678,6 +678,11 @@ struct i915_ctx_hang_stats {
|
||||||
/* Time when this context was last blamed for a GPU reset */
|
/* Time when this context was last blamed for a GPU reset */
|
||||||
unsigned long guilty_ts;
|
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 */
|
/* This context is banned to submit more work */
|
||||||
bool banned;
|
bool banned;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2535,7 +2535,8 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
|
||||||
if (ctx->hang_stats.banned)
|
if (ctx->hang_stats.banned)
|
||||||
return true;
|
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)) {
|
if (!i915_gem_context_is_default(ctx)) {
|
||||||
DRM_DEBUG("context hanging too fast, banning!\n");
|
DRM_DEBUG("context hanging too fast, banning!\n");
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -222,6 +222,8 @@ __create_hw_context(struct drm_device *dev,
|
||||||
* is no remap info, it will be a NOP. */
|
* is no remap info, it will be a NOP. */
|
||||||
ctx->remap_slice = (1 << NUM_L3_SLICES(dev)) - 1;
|
ctx->remap_slice = (1 << NUM_L3_SLICES(dev)) - 1;
|
||||||
|
|
||||||
|
ctx->hang_stats.ban_period_seconds = DRM_I915_CTX_BAN_PERIOD;
|
||||||
|
|
||||||
return ctx;
|
return ctx;
|
||||||
|
|
||||||
err_out:
|
err_out:
|
||||||
|
|
Loading…
Reference in a new issue