diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2018-03-12 13:03:07 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-03-12 22:06:19 +0000 |
| commit | c37d57282033067edf60e044229a4b4f367cc81b (patch) | |
| tree | a2c0a18d5fd9fde640dba9d67ee9771dd9d81684 /drivers/gpu/drm/i915/intel_huc.h | |
| parent | 3c33fc7c1af9a3426eff9015e5bab08a21a5fa9d (diff) | |
| download | linux-stable-c37d57282033067edf60e044229a4b4f367cc81b.tar.gz linux-stable-c37d57282033067edf60e044229a4b4f367cc81b.tar.bz2 linux-stable-c37d57282033067edf60e044229a4b4f367cc81b.zip | |
drm/i915/uc: Sanitize uC together with GEM
Instead of dancing around uC on reset/suspend/resume scenarios,
explicitly sanitize uC when we sanitize GEM to force uC reload
and start from known beginning.
v2: don't forget about reset path (Daniele)
sanitize uc before gem initiated full reset (Daniele)
v3: drop redundant disable_communication in init_hw (Daniele)
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@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/20180312130308.22952-3-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_huc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h index 5d6e804f9771..b1858503c451 100644 --- a/drivers/gpu/drm/i915/intel_huc.h +++ b/drivers/gpu/drm/i915/intel_huc.h @@ -38,4 +38,10 @@ struct intel_huc { void intel_huc_init_early(struct intel_huc *huc); int intel_huc_auth(struct intel_huc *huc); +static inline int intel_huc_sanitize(struct intel_huc *huc) +{ + intel_uc_fw_sanitize(&huc->fw); + return 0; +} + #endif |