| Message ID | 20180517060738.19193-44-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a5694b0a7e6a..c451d61eeca1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4952,7 +4952,7 @@ void i915_gem_sanitize(struct drm_i915_private *i915) * of the reset, so this could be applied to even earlier gen. */ err = -ENODEV; - if (INTEL_GEN(i915) >= 5 && intel_has_gpu_reset(i915)) { + if (DRIVER_CAPS(i915)->has_contexts && intel_has_gpu_reset(i915)) { if (!WARN_ON(intel_gpu_reset(i915, ALL_ENGINES))) { for_each_engine(engine, i915, id) { if (engine->reset.reset)
While we believe that we need to always reset the GPU to scrub the state on transition to/from the driver, it is essential when we enable contexts. Generalize the gen test to be on context-support instead. References: d2b4b97933f5 ("drm/i915: Record the default hw state after reset upon load" Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)