[PATCH 3/5] drm/i915/uc: Never fail on HuC firmware errors
Michal Wajdeczko
michal.wajdeczko at intel.com
Fri Aug 16 18:18:27 UTC 2019
There is no solid need to mark whole GPU as wedged just
because of HuC failure as users can always verify actual
HuC firmware status using existing HUC_STATUS ioctl.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +++-
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 13 ++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 1edda1657411..062b6c99ef36 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -122,9 +122,11 @@ int intel_huc_auth(struct intel_huc *huc)
struct intel_guc *guc = >->uc.guc;
int ret;
- GEM_BUG_ON(!intel_uc_fw_is_loaded(&huc->fw));
GEM_BUG_ON(intel_huc_is_authenticated(huc));
+ if (!intel_uc_fw_is_loaded(&huc->fw))
+ return -ENOEXEC;
+
ret = i915_inject_load_error(gt->i915, -ENXIO);
if (ret)
goto fail;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 72f99526dacd..a11ccc32d4c7 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -464,12 +464,7 @@ int intel_uc_init_hw(struct intel_uc *uc)
if (ret)
goto err_out;
- if (intel_uc_uses_huc(uc)) {
- ret = intel_huc_fw_upload(huc);
- if (ret && intel_uc_fw_is_overridden(&huc->fw))
- goto err_out;
- }
-
+ intel_huc_fw_upload(huc);
intel_guc_ads_reset(guc);
intel_guc_write_params(guc);
ret = intel_guc_fw_upload(guc);
@@ -488,11 +483,7 @@ int intel_uc_init_hw(struct intel_uc *uc)
if (ret)
goto err_log_capture;
- if (intel_uc_fw_is_loaded(&huc->fw)) {
- ret = intel_huc_auth(huc);
- if (ret && intel_uc_fw_is_overridden(&huc->fw))
- goto err_communication;
- }
+ intel_huc_auth(huc);
ret = intel_guc_sample_forcewake(guc);
if (ret)
--
2.19.2
More information about the Intel-gfx-trybot
mailing list