[Intel-gfx] [PATCH v3 08/14] drm/i915/guc: Pick better place for Guc final status message
Sagar Arun Kamble
sagar.a.kamble at intel.com
Fri Oct 13 06:54:14 UTC 2017
On 10/13/2017 4:24 AM, Michal Wajdeczko wrote:
> Guc status message printed right after firmware upload may be too
> optimistic, as we may fail on subsequent steps. Move that message
> to the end of intel_uc_init_hw where we know the status for sure.
>
> v2: use dev_info (Chris)
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_guc_fw.c | 6 ------
> drivers/gpu/drm/i915/intel_uc.c | 6 ++++++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index 020ce26..51be318 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -294,11 +294,5 @@ int intel_guc_fw_upload(struct intel_guc *guc)
>
> guc->fw.load_status = INTEL_UC_FIRMWARE_SUCCESS;
>
> - DRM_INFO("GuC %s (firmware %s [version %u.%u])\n",
> - i915_modparams.enable_guc_submission ? "submission enabled" :
> - "loaded",
> - guc->fw.path,
> - guc->fw.major_ver_found, guc->fw.minor_ver_found);
> -
It would be good to say "GuC loaded (firmware _path_ [version x.x])" here.
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 048f5c4..9d84fdd 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -222,6 +222,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
> goto err_interrupts;
> }
>
> + dev_info(dev_priv->drm.dev, "GuC %s (firmware %s [version %u.%u])\n",
> + i915_modparams.enable_guc_submission ? "submission enabled" :
> + "loaded",
> + guc->fw.path,
> + guc->fw.major_ver_found, guc->fw.minor_ver_found);
> +
And move this print inside i915_guc_submission_enable (And limit to
"submission enabled"/"submission disabled" as we plan to enable/disable
submission during resume from sleep/reset.
> return 0;
>
> /*
More information about the Intel-gfx
mailing list