Commit 13e867f6 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Ander Conselvan de Oliveira

i915/HuC: Add an extra check for platforms that do not have HUC

Return silently without producing much noise on platforms
that have a HuC but the firmware is absent.

Cc: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@itel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1488398335-13121-1-git-send-email-anusha.srivatsa@intel.com
parent 1f58c8e7
...@@ -181,12 +181,14 @@ void intel_huc_init(struct drm_i915_private *dev_priv) ...@@ -181,12 +181,14 @@ void intel_huc_init(struct drm_i915_private *dev_priv)
} }
huc_fw->path = fw_path; huc_fw->path = fw_path;
if (huc_fw->path == NULL)
return;
huc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING; huc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
DRM_DEBUG_DRIVER("HuC firmware pending, path %s\n", fw_path); DRM_DEBUG_DRIVER("HuC firmware pending, path %s\n", fw_path);
WARN(huc_fw->path == NULL, "HuC present but no fw path\n");
intel_uc_fw_fetch(dev_priv, huc_fw); intel_uc_fw_fetch(dev_priv, huc_fw);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment