drm/i915/huc: Don't fail the probe if HuC init fails

The previous patch introduced new failure cases in the HuC init flow
that can be hit by simply changing the config, so we want to avoid
failing the probe in those scenarios. HuC load failure is already
considered a non-fatal error and we have a way to report to userspace
if the HuC is not available via a dedicated getparam, so no changes
in expectation there.
The error message in the HuC init code has also been lowered to info to
avoid throwing error message for an expected behavior.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220504204816.2082588-5-daniele.ceraolospurio@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index c36e2bf9b0f2987ff3e975cd9b11c6cb02ebd9b9..3bb8838e325a4121ce478c526eb7348d4b4f62d3 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -113,7 +113,7 @@ int intel_huc_init(struct intel_huc *huc)
        return 0;
 
 out:
-       i915_probe_error(i915, "failed with %d\n", err);
+       drm_info(&i915->drm, "HuC init failed with %d\n", err);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 0dce94f896a8c18397f24b9120b03eb836237c36..ecf149c5fdb022996a5534fcbd6f34f3e4185930 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -323,17 +323,10 @@ static int __uc_init(struct intel_uc *uc)
        if (ret)
                return ret;
 
-       if (intel_uc_uses_huc(uc)) {
-               ret = intel_huc_init(huc);
-               if (ret)
-                       goto out_guc;
-       }
+       if (intel_uc_uses_huc(uc))
+               intel_huc_init(huc);
 
        return 0;
-
-out_guc:
-       intel_guc_fini(guc);
-       return ret;
 }
 
 static void __uc_fini(struct intel_uc *uc)