Attachment 95112 Details for Bug 75145 – [PATCH] drm/i915: Don't ban default context when stop_rings!=0

[patch] [PATCH] drm/i915: Don't ban default context when stop_rings!=0

0001-drm-i915-Don-t-ban-default-context-when-stop_rings-0.patch (text/plain), 1.48 KB, created by Ville Syrjala on 2014-03-04 19:03:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2014-03-04 19:03:55 UTC

Size: 1.48 KB

patch

obsolete

>From 1fc59f5e3d2b5fee70f6ab2891b0234282dbb6bd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Thu, 20 Feb 2014 19:22:31 +0200
>Subject: [PATCH] drm/i915: Don't ban default context when stop_rings!=0
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If we've explicitly stopped the rings for testing purposes, don't ban
>the default context. Fixes kms_flip hang tests.
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
>I'm not sure this is what we want in general, but it's what kms_flip expects
>currently.
>
> drivers/gpu/drm/i915/i915_gem.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 3618bb0..52f9ea7 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2259,14 +2259,13 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
> 		return true;
> 
> 	if (elapsed <= DRM_I915_CTX_BAN_PERIOD) {
>-		if (dev_priv->gpu_error.stop_rings == 0 &&
>-		    i915_gem_context_is_default(ctx)) {
>-			DRM_ERROR("gpu hanging too fast, banning!\n");
>-		} else {
>+		if (!i915_gem_context_is_default(ctx)) {
> 			DRM_DEBUG("context hanging too fast, banning!\n");
>+			return true;
>+		} else if (dev_priv->gpu_error.stop_rings == 0) {
>+			DRM_ERROR("gpu hanging too fast, banning!\n");
>+			return true;
> 		}
>-
>-		return true;
> 	}
> 
> 	return false;
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 75145: 94270 | 95112 | 95278

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.