drm/i915/guc: Update Guc messages on load failure

In case of GuC firmware loading failure we were reporting
DRM_ERROR also for case when GuC loading was not strictly
required.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171016144724.17244-14-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 9d84fdd08302561c62ce197cdb1123b81f33986b..25bd162f38d25afd6c5b0f0bc9518a5041389069 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -250,12 +250,14 @@ err_submission:
 err_guc:
        i915_ggtt_disable_guc(dev_priv);
 
-       DRM_ERROR("GuC init failed\n");
        if (i915_modparams.enable_guc_loading > 1 ||
-           i915_modparams.enable_guc_submission > 1)
+           i915_modparams.enable_guc_submission > 1) {
+               DRM_ERROR("GuC init failed. Firmware loading disabled.\n");
                ret = -EIO;
-       else
+       } else {
+               DRM_NOTE("GuC init failed. Firmware loading disabled.\n");
                ret = 0;
+       }
 
        if (i915_modparams.enable_guc_submission) {
                i915_modparams.enable_guc_submission = 0;
@@ -263,7 +265,6 @@ err_guc:
        }
 
        i915_modparams.enable_guc_loading = 0;
-       DRM_NOTE("GuC firmware loading disabled\n");
 
        return ret;
 }