leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Daniele Ceraolo Spurio
2022-05-04 13:48:16 -07:00
parent 6f67930af7
commit 56ca3117f7
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/gt/uc/intel_huc.c
View File

@@ -113,7 +113,7 @@ int intel_huc_init(struct intel_huc *huc)
return 0; return 0;
out: out:
i915_probe_error(i915, "failed with %d\n", err); drm_info(&i915->drm, "HuC init failed with %d\n", err);
return err; return err;
} }

11
drivers/gpu/drm/i915/gt/uc/intel_uc.c
View File

@@ -323,17 +323,10 @@ static int __uc_init(struct intel_uc *uc)
if (ret) if (ret)
return ret; return ret;
if (intel_uc_uses_huc(uc)) { if (intel_uc_uses_huc(uc))
ret = intel_huc_init(huc); intel_huc_init(huc);
if (ret)
goto out_guc;
}
return 0; return 0;
out_guc:
intel_guc_fini(guc);
return ret;
} }
static void __uc_fini(struct intel_uc *uc) static void __uc_fini(struct intel_uc *uc)