diff options
| author | Ville Syrjälä | 2014-02-21 15:26:47 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-05 21:30:14 +0100 |
| commit | ccc7bed05e27a654db1e9e248ce5fb291c12add1 (patch) | |
| tree | 122de9b1cae3c026810c7c3803288ce2ee41eba7 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: print connector mode list in display_info (diff) | |
| download | kernel-qcow2-linux-ccc7bed05e27a654db1e9e248ce5fb291c12add1.tar.gz kernel-qcow2-linux-ccc7bed05e27a654db1e9e248ce5fb291c12add1.tar.xz kernel-qcow2-linux-ccc7bed05e27a654db1e9e248ce5fb291c12add1.zip | |
drm/i915: Don't ban default context when stop_rings!=0
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>
Acked-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6978e692cd82..0ec1080b1912 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2255,14 +2255,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; |