From: Sujaritha Sundaresan Date: Thu, 7 Mar 2019 18:44:44 +0000 (-0800) Subject: drm/i915/guc: Preparing for GuC reset along with engine reset X-Git-Tag: for-linus-20190516~41^2~35^2~57 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=628ac441e8547340ea47f701c3b87ec60831e8f2;p=linux-block.git drm/i915/guc: Preparing for GuC reset along with engine reset Adding the call to prepare for guc reset along with engine reset. intel_uc_reset_prepare() calls to disable guc communication and to sanitize. Cc: Daniele Ceraolo Spurio Cc: Michal Wajdeczko Signed-off-by: Sujaritha Sundaresan Reviewed-by: Daniele Ceraolo Spurio Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190307184445.25895-1-sujaritha.sundaresan@intel.com --- diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c index 3c08e08837d0..3737cb73b8f4 100644 --- a/drivers/gpu/drm/i915/i915_reset.c +++ b/drivers/gpu/drm/i915/i915_reset.c @@ -826,6 +826,8 @@ static void __i915_gem_set_wedged(struct drm_i915_private *i915) for_each_engine(engine, i915, id) reset_prepare_engine(engine); + intel_uc_reset_prepare(i915); + /* Even if the GPU reset fails, it should still stop the engines */ if (!INTEL_INFO(i915)->gpu_reset_clobbers_display) intel_gpu_reset(i915, ALL_ENGINES);