Quoting Michal Wajdeczko (2019-08-18 10:52:03)
> If we failed to fetch default GuC firmware and we didn't plan
> to use it for the submission and we never have used GuC before
> then we may continue normal driver load, no need to declare
> GPU wedged (we can use execlist for submission) and it is safe
> to run without the HuC (users will check HuC status anyway).
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> index 6f0b9e05a5f6..10978e7ff06d 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> @@ -400,6 +400,15 @@ static int uc_init_wopcm(struct intel_uc *uc)
> return err;
> }
>
> +static bool uc_is_wopcm_locked(struct intel_uc *uc)
> +{
> + struct intel_gt *gt = uc_to_gt(uc);
> + struct intel_uncore *uncore = gt->uncore;
> +
> + return (intel_uncore_read(uncore, GUC_WOPCM_SIZE) & GUC_WOPCM_SIZE_LOCKED) ||
> + (intel_uncore_read(uncore, DMA_GUC_WOPCM_OFFSET) & GUC_WOPCM_OFFSET_VALID);
> +}
> +
> int intel_uc_init_hw(struct intel_uc *uc)
> {
> struct drm_i915_private *i915 = uc_to_gt(uc)->i915;
> @@ -410,11 +419,19 @@ int intel_uc_init_hw(struct intel_uc *uc)
> if (!intel_uc_supports_guc(uc))
> return 0;
>
> - if (!intel_uc_uses_guc(uc))
> + /*
> + * We can silently continue without GuC only if it was never enabled
> + * before on this system after reboot, otherwise we risk GPU hangs.
> + * To check if GuC was loaded before we look at WOPCM registers.
> + */
> + if (!intel_uc_uses_guc(uc) && !uc_is_wopcm_locked(uc))
> return 0;
>
> if (!intel_uc_fw_is_available(&guc->fw)) {
> - ret = intel_uc_fw_status_to_error(guc->fw.status);
> + ret = uc_is_wopcm_locked(uc) ||
> + intel_uc_fw_is_overridden(&guc->fw) ||
> + intel_uc_supports_guc_submission(uc) ?
> + intel_uc_fw_status_to_error(guc->fw.status) : 0;
I'm just going to leave it out here that this is a bit of a mouthful,
and would suggest a small function to clarify -- but naming is hard.
Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
