diff options
| author | Sujaritha Sundaresan <sujaritha.sundaresan@intel.com> | 2019-03-07 10:44:44 -0800 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-03-14 08:31:47 +0000 |
| commit | 628ac441e8547340ea47f701c3b87ec60831e8f2 (patch) | |
| tree | 18db64a3fb876b5c27c4abefc7224880c574eeac /drivers/gpu/drm/i915/i915_reset.c | |
| parent | 8a9a5608a31b23a8da4be67285176dd4cacfa574 (diff) | |
| download | linux-628ac441e8547340ea47f701c3b87ec60831e8f2.tar.gz linux-628ac441e8547340ea47f701c3b87ec60831e8f2.tar.bz2 linux-628ac441e8547340ea47f701c3b87ec60831e8f2.zip | |
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 <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190307184445.25895-1-sujaritha.sundaresan@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reset.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reset.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |