Merge drm/drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gt / uc / intel_huc.c

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 32a069841c14b34ceb1b9cbeffc51b1d1debb0e6..a74b65694512f648c83a7d69a45a5c7561541d69 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -121,19 +121,20 @@ int intel_huc_init(struct intel_huc *huc)
        if (err)
                goto out_fini;
 
+       intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOADABLE);
+
        return 0;
 
 out_fini:
        intel_uc_fw_fini(&huc->fw);
 out:
-       intel_uc_fw_cleanup_fetch(&huc->fw);
-       DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "failed with %d\n", err);
+       i915_probe_error(i915, "failed with %d\n", err);
        return err;
 }
 
 void intel_huc_fini(struct intel_huc *huc)
 {
-       if (!intel_uc_fw_is_available(&huc->fw))
+       if (!intel_uc_fw_is_loadable(&huc->fw))
                return;
 
        intel_huc_rsa_data_destroy(huc);