Commit 4e50f796 authored by Dave Gordon's avatar Dave Gordon Committed by Tvrtko Ursulin

drm/i915/guc: suppress GuC-related message on non-GuC platforms

If the user doesn't override the default values of the GuC-related
kernel parameters, then on a non-GuC-based platform we shouldn't
mention that we haven't loaded the GuC firmware.

The various messages have been reordered into a least->most severe
cascade (none/INFO/INFO/ERROR) for ease of comprehension.
Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1465575685-34169-1-git-send-email-david.s.gordon@intel.com
parent 8c07eb68
...@@ -525,12 +525,14 @@ int intel_guc_setup(struct drm_device *dev) ...@@ -525,12 +525,14 @@ int intel_guc_setup(struct drm_device *dev)
ret = 0; ret = 0;
} }
if (err == 0) if (err == 0 && !HAS_GUC_UCODE(dev))
; /* Don't mention the GuC! */
else if (err == 0)
DRM_INFO("GuC firmware load skipped\n"); DRM_INFO("GuC firmware load skipped\n");
else if (ret == -EIO) else if (ret != -EIO)
DRM_ERROR("GuC firmware load failed: %d\n", err);
else
DRM_INFO("GuC firmware load failed: %d\n", err); DRM_INFO("GuC firmware load failed: %d\n", err);
else
DRM_ERROR("GuC firmware load failed: %d\n", err);
if (i915.enable_guc_submission) { if (i915.enable_guc_submission) {
if (fw_path == NULL) if (fw_path == NULL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment