On Tue, Feb 14, 2017 at 05:15:41PM +0100, Arkadiusz Hiler wrote:
> 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.
>
> Cc: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Michal Winiarski <michal.winiarski@xxxxxxxxx>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_guc_loader.c | 28 +++++++++++-----------------
> drivers/gpu/drm/i915/intel_huc.c | 18 ++++++++----------
> 2 files changed, 19 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 4ea705d..f4875c2 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -434,12 +434,8 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)
> intel_uc_fw_status_repr(guc_fw->load_status));
>
> if (fw_path == NULL) {
> - /* Device is known to have no uCode (e.g. no GuC) */
> + /* We do not have uCode for the device */
> return -ENXIO;
> - } else if (*fw_path == '\0') {
> - /* Device has a GuC but we don't know what f/w to load? */
> - WARN(1, "No GuC firmware known for this platform!\n");
> - return -ENODEV;
> }
>
> /* Fetch failed, or already fetched but failed to load? */
> @@ -625,11 +621,13 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
> void intel_guc_init(struct drm_i915_private *dev_priv)
> {
> struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
> - const char *fw_path;
> + const char *fw_path = NULL;
Do we still need this ? Maybe we can directly use guc_fw->path?
>
> - if (!HAS_GUC_UCODE(dev_priv)) {
> - fw_path = NULL;
> - } else if (IS_SKYLAKE(dev_priv)) {
> + 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->major_ver_wanted = SKL_FW_MAJOR;
> guc_fw->minor_ver_wanted = SKL_FW_MINOR;
> @@ -641,24 +639,20 @@ void intel_guc_init(struct drm_i915_private *dev_priv)
> 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 */
> + } else if (HAS_GUC_UCODE(dev_priv)) {
> + WARN(1, "No GuC firmware known for platform with GuC!\n");
> + i915.enable_guc_loading = 0;
Can we return here ?
> }
>
> guc_fw->path = fw_path;
> - guc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;
> - guc_fw->load_status = INTEL_UC_FIRMWARE_NONE;
>
> - /* Early (and silent) return if GuC loading is disabled */
> + /* Early return if we do not have firmware to fetch */
> if (fw_path == NULL)
> return;
> - if (*fw_path == '\0')
> - return;
>
> guc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
> DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path);
Above two lines should be part of fw_fetch() function called below.
Will cover Huc case as well.
> intel_uc_fw_fetch(dev_priv, guc_fw);
> - /* status must now be FAIL or SUCCESS */
> }
>
> /**
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index 94d369b..70606e6 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -154,18 +154,13 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)
> */
> void intel_huc_init(struct drm_i915_private *dev_priv)
> {
> - struct intel_huc *huc = &dev_priv->huc;
> - struct intel_uc_fw *huc_fw = &huc->fw;
> + struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
> const char *fw_path = NULL;
>
> - huc_fw->path = NULL;
> huc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;
> huc_fw->load_status = INTEL_UC_FIRMWARE_NONE;
> huc_fw->fw = INTEL_UC_FW_TYPE_HUC;
>
> - if (!HAS_HUC_UCODE(dev_priv))
> - return;
> -
> if (IS_SKYLAKE(dev_priv)) {
> fw_path = I915_SKL_HUC_UCODE;
> huc_fw->major_ver_wanted = SKL_HUC_FW_MAJOR;
> @@ -178,15 +173,18 @@ void intel_huc_init(struct drm_i915_private *dev_priv)
> fw_path = I915_KBL_HUC_UCODE;
> huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;
> huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;
> + } else if (HAS_HUC_UCODE(dev_priv)) {
> + WARN(1, "No HuC firmware known for platform with HuC!\n");
Can we simplify this into:
} else {
WARN(HAS_HUC_UCODE(dev_priv), "No HuC firmware known for platform with HuC!\n");
return;
Regards,
Michal
> }
>
> huc_fw->path = fw_path;
> +
> + /* Early return if we do not have firmware to fetch */
> + if (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);
> }
>
> --
> 2.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
