diff options
| author | Michal Wajdeczko | 2017-12-06 14:53:14 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-12-06 15:41:52 +0100 |
| commit | 8620eb1dbbf287694ee8e0cd280fadedb1f91012 (patch) | |
| tree | 38b4a353850c8c642732e35ef2c4adba2048735f /drivers/gpu/drm/i915/intel_uc_fw.c | |
| parent | drm/i915/uc: Don't fetch GuC firmware if no plan to use GuC (diff) | |
| download | kernel-qcow2-linux-8620eb1dbbf287694ee8e0cd280fadedb1f91012.tar.gz kernel-qcow2-linux-8620eb1dbbf287694ee8e0cd280fadedb1f91012.tar.xz kernel-qcow2-linux-8620eb1dbbf287694ee8e0cd280fadedb1f91012.zip | |
drm/i915/uc: Don't use -EIO to report missing firmware
-EIO has special meaning and is used when we want to allow
engine initialization to fail and mark GPU as wedged.
However here at this function we should return error code
that corresponds to upload status only, as any decision how
to handle missing firmware should be done higher level function
(silent fallback to non-GuC mode, fail into wedged mode, or
abort driver load with fatal error).
v2: commit message update (Michal)
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171206135316.32556-5-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc_fw.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc_fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc_fw.c b/drivers/gpu/drm/i915/intel_uc_fw.c index b376dd3b28cc..784eff9cdfc8 100644 --- a/drivers/gpu/drm/i915/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/intel_uc_fw.c @@ -214,7 +214,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, intel_uc_fw_type_repr(uc_fw->type), uc_fw->path); if (uc_fw->fetch_status != INTEL_UC_FIRMWARE_SUCCESS) - return -EIO; + return -ENOEXEC; uc_fw->load_status = INTEL_UC_FIRMWARE_PENDING; DRM_DEBUG_DRIVER("%s fw load %s\n", |