korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-07 06:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/uc: Never fail on HuC firmware errors

Browse Source 
There is no need to mark whole GPU as wedged just because
of the custom HuC fw failure as users can always verify
actual HuC firmware status using existing HUC_STATUS ioctl.

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>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190818095204.31568-4-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2019-08-18 09:52:04 +00:00 committed by Chris Wilson
parent ee40214027
commit a8dc0f6d18
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,9 +129,11 @@ int intel_huc_auth(struct intel_huc *huc)
struct intel_guc *guc = &gt->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;

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

@ -457,12 +457,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);
@ -481,11 +476,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)