diff options
| author |   Anusha Srivatsa <anusha.srivatsa@intel.com> | 2017-03-01 11:58:55 -0800 |
|---|---|---|
| committer |   Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2017-03-02 16:15:44 +0200 |
| commit | 13e867f6faaafe4d7fdaa4a894a061d041d0dc88 (patch) | |
| tree | 4f3a4138f2453900906d1e90d141d364ea8ecf15 /drivers/gpu/drm/i915/intel_huc.c | |
| parent | drm/i915: Restore the invalid access without RPM warning (diff) | |
| download | linux-dev-13e867f6faaafe4d7fdaa4a894a061d041d0dc88.tar.xz linux-dev-13e867f6faaafe4d7fdaa4a894a061d041d0dc88.zip | |
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: 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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_huc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index c28543d220a2..e660109fc51e 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -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); } |