diff options
author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2017-03-14 15:28:12 +0100 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2017-03-15 14:26:30 +0200 |
commit | 8fc2a4e427991433ea6358117fdbcc07494ff8c5 (patch) | |
tree | 6962b0f5f149386015df8090b242b33fce9bafe0 /drivers/gpu/drm/i915/intel_guc_loader.c | |
parent | 6cd5a72c357732ed7f4566545b9d58eb4fcb1aa2 (diff) | |
download | op-kernel-dev-8fc2a4e427991433ea6358117fdbcc07494ff8c5.zip op-kernel-dev-8fc2a4e427991433ea6358117fdbcc07494ff8c5.tar.gz |
drm/i915/uc: Simplify firmware path handling
Currently fw->path values can represent one of three possible states:
1) NULL - device without the uC
2) '\0' - device with the uC but have no firmware
3) else - device with the uC and we have firmware
Second case is used only to WARN at a later stage.
We can WARN right away and merge cases 1 and 2.
Code can be even further simplified and common (HuC/GuC logic) happening
right before the fetch can be offloaded to the common function.
v2: fewer temporary variables, more straightforward flow (M. Wajdeczko)
v3: DRM_ERROR instead of WARN (M. Wajdeczko)
v4: coding standard (J. Lahtinen)
v5: non-trivial rebase
v6: remove path check, we are checking fetch status (M. Wajdeczko)
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_loader.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_guc_loader.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 0a29c1b..d731f68 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -368,13 +368,6 @@ int intel_guc_init_hw(struct intel_guc *guc) intel_uc_fw_status_repr(guc->fw.fetch_status), intel_uc_fw_status_repr(guc->fw.load_status)); - if (!fw_path) { - return -ENXIO; - } else if (*fw_path == '\0') { - WARN(1, "No GuC firmware known for this platform!\n"); - return -ENODEV; - } - if (guc->fw.fetch_status != INTEL_UC_FIRMWARE_SUCCESS) return -EIO; @@ -399,7 +392,6 @@ int intel_guc_init_hw(struct intel_guc *guc) return 0; } - /** * intel_guc_init_fw() - select and prepare firmware for loading * @guc: intel_guc struct @@ -412,37 +404,31 @@ int intel_guc_init_hw(struct intel_guc *guc) void intel_guc_init_fw(struct intel_guc *guc) { struct drm_i915_private *dev_priv = guc_to_i915(guc); - const char *fw_path; + + guc->fw.path = NULL; + guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; + guc->fw.load_status = INTEL_UC_FIRMWARE_NONE; + guc->fw.fw = INTEL_UC_FW_TYPE_GUC; if (IS_SKYLAKE(dev_priv)) { - fw_path = I915_SKL_GUC_UCODE; + guc->fw.path = I915_SKL_GUC_UCODE; guc->fw.major_ver_wanted = SKL_FW_MAJOR; guc->fw.minor_ver_wanted = SKL_FW_MINOR; } else if (IS_BROXTON(dev_priv)) { - fw_path = I915_BXT_GUC_UCODE; + guc->fw.path = I915_BXT_GUC_UCODE; guc->fw.major_ver_wanted = BXT_FW_MAJOR; guc->fw.minor_ver_wanted = BXT_FW_MINOR; } else if (IS_KABYLAKE(dev_priv)) { - fw_path = I915_KBL_GUC_UCODE; + guc->fw.path = I915_KBL_GUC_UCODE; guc->fw.major_ver_wanted = KBL_FW_MAJOR; guc->fw.minor_ver_wanted = KBL_FW_MINOR; } else { - fw_path = ""; /* unknown device */ - } - - guc->fw.path = fw_path; - guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; - guc->fw.load_status = INTEL_UC_FIRMWARE_NONE; - - if (fw_path == NULL) - return; - if (*fw_path == '\0') + DRM_ERROR("No GuC firmware known for platform with GuC!\n"); + i915.enable_guc_loading = 0; return; + } - guc->fw.fetch_status = INTEL_UC_FIRMWARE_PENDING; - DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path); intel_uc_prepare_fw(dev_priv, &guc->fw); - /* status must now be FAIL or SUCCESS */ } /** |