Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f65208f authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

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: default avatarMichal 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171016144724.17244-14-michal.wajdeczko@intel.com
parent 4502e9ec

drivers/gpu/drm/i915/intel_uc.c

+5 −4
Original line number Diff line number Diff line
@@ -250,12 +250,14 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) 
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 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) 
	}



	i915_modparams.enable_guc_loading = 0;

	DRM_NOTE("GuC firmware loading disabled\n");



	return ret;

}