]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/i915/guc: Log significant events at the info level
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 7 Feb 2017 08:50:25 +0000 (08:50 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Wed, 8 Feb 2017 16:00:01 +0000 (16:00 +0000)
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.

v2:
  * Log message polish. (Chris)
  * Future proof by reporting found firmware version. (Michal)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> (v1)
Link: http://patchwork.freedesktop.org/patch/msgid/1486457425-32548-1-git-send-email-tvrtko.ursulin@linux.intel.com
drivers/gpu/drm/i915/intel_guc_loader.c

index 2f1cf9aea04ed779f2d25b4f7464c29ecac0d90e..8ef33d88d5a0306d5483813d6e46624bf0e6d061 100644 (file)
@@ -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 [version %u.%u])\n",
+                i915.enable_guc_submission ? "submission enabled" : "loaded",
+                guc_fw->path,
+                guc_fw->major_ver_found, guc_fw->minor_ver_found);
+
        return 0;
 
 fail: