diff mbox series

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

Message ID 20190329221118.17308-30-michal.wajdeczko@intel.com (mailing list archive)
State New, archived
Headers show
Series GuC 32.0.3 | expand

Commit Message

Michal Wajdeczko March 29, 2019, 10:11 p.m. UTC 
Some Gen9 CI systems are still prepared to run no longer supported
configuration "enable_guc=3"

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

Patch

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);