On Mon, Feb 06, 2017 at 11:32:06AM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>
> Currently to establish whether GuC firmware has been loaded or
> submission enabled (default DRM log level), one has to detect
> the absence of the message saying that the load has been skipped
> and infer the opposite.
>
> It is better to log the fact GuC firmware has been loaded and/or
> submission enabled explicitly to avoid any guesswork when looking
> at the logs.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 2f1cf9aea04e..ccf55d6a164e 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -520,10 +520,6 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)
>
> guc_fw->load_status = INTEL_UC_FIRMWARE_SUCCESS;
>
> - DRM_DEBUG_DRIVER("GuC fw status: fetch %s, load %s\n",
> - intel_uc_fw_status_repr(guc_fw->fetch_status),
> - intel_uc_fw_status_repr(guc_fw->load_status));
> -
> intel_guc_auth_huc(dev_priv);
>
> if (i915.enable_guc_submission) {
> @@ -536,6 +532,11 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)
> guc_interrupts_capture(dev_priv);
> }
>
> + DRM_INFO("GuC %s (firmware %s [%u.%u])\n",
> + i915.enable_guc_submission ? "submission enabled" : "loaded",
> + guc_fw->path,
> + guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);
While with today code it is hard to load fw with different version than 'wanted'
(due to filename schema) but maybe we should still report ver_found here?
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Regards,
Michal
> +
> return 0;
>
> fail:
> --
> 2.7.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
