Skip to content

Commit

Permalink
i915/HuC: Add an extra check for platforms that do not have HUC
Browse files Browse the repository at this point in the history
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: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Ander 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
  • Loading branch information
Anusha Srivatsa authored and Ander Conselvan de Oliveira committed Mar 2, 2017
1 parent 1f58c8e commit 13e867f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/intel_huc.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,14 @@ void intel_huc_init(struct drm_i915_private *dev_priv)
}

huc_fw->path = fw_path;

if (huc_fw->path == NULL)
return;

huc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;

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);
}

Expand Down

0 comments on commit 13e867f

Please sign in to comment.