UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/uc: Don't fail on HuC early init errors 

Since commit 301efe96f7 ("drm/i915/uc: Don't fail on HuC
firmware failure") we can continue driver load after error
during HuC firmware load or authentication, but we could
still fail on any error during early HuC initialization.
Change that by ignoring HuC related errors until hardware
initialization phase where we can decide about next steps.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190804195052.31140-5-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2019-08-04 19:50:52 +00:00 committed by Chris Wilson
parent 34f0a20fa4
commit d9a910f5ed
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,11 @@ static int intel_huc_rsa_data_create(struct intel_huc *huc)
struct i915_vma *vma;
size_t copied;
void *vaddr;
int err;
err = i915_inject_load_error(gt->i915, -ENXIO);
if (err)
return err;
/*
* HuC firmware will sit above GUC_GGTT_TOP and will not map
@ -115,8 +120,8 @@ out_fini:
void intel_huc_fini(struct intel_huc *huc)
{
intel_uc_fw_fini(&huc->fw);
intel_huc_rsa_data_destroy(huc);
intel_uc_fw_fini(&huc->fw);
}
/**

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

@ -316,14 +316,14 @@ int intel_uc_init(struct intel_uc *uc)
if (intel_uc_supports_huc(uc)) {
ret = intel_huc_init(huc);
if (ret)
goto err_guc;
goto out_huc;
}
return 0;
err_guc:
intel_guc_fini(guc);
return ret;
out_huc:
intel_uc_fw_cleanup_fetch(&huc->fw);
return 0;
}
void intel_uc_fini(struct intel_uc *uc)