[Intel-gfx] [PATCH 29/30] HAX: prevent CI failures on pre-Gen11 configs with forced GuC

Michal Wajdeczko michal.wajdeczko at intel.com
Fri Mar 29 22:11:17 UTC 2019


Some Gen9 CI systems are still prepared to run no longer supported
configuration "enable_guc=3"

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 1e7ad200e761..a522889c542f 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -109,6 +109,10 @@ static void sanitize_options_early(struct drm_i915_private *i915)
 	struct intel_uc_fw *guc_fw = &i915->guc.fw;
 	struct intel_uc_fw *huc_fw = &i915->huc.fw;
 
+	/* HAX: prevent CI failures on pre-Gen11 configs with forced GuC */
+	if (i915_modparams.enable_guc && INTEL_GEN(i915) < 11)
+		i915_modparams.enable_guc &= ~ENABLE_GUC_SUBMISSION;
+
 	/* A negative value means "use platform default" */
 	if (i915_modparams.enable_guc < 0)
 		i915_modparams.enable_guc = __get_platform_enable_guc(i915);
-- 
2.19.2



More information about the Intel-gfx mailing list