[Intel-gfx] [CI 21/21] HAX Don't enable GuC submission on pre-Gen11 even if forced

Michal Wajdeczko michal.wajdeczko at intel.com
Wed Aug 29 19:36:34 UTC 2018


This is just to fool CI skl|kbl-guc machines

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

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 185b29b..95697c0 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -122,6 +122,8 @@ static void sanitize_options_early(struct drm_i915_private *i915)
 		DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
 			 "enable_guc", i915_modparams.enable_guc,
 			 "submission not supported");
+		i915_modparams.enable_guc &= ~ENABLE_GUC_SUBMISSION;
+		GEM_BUG_ON(intel_uc_is_using_guc_submission());
 	}
 
 	/* Verify GuC firmware availability */
-- 
1.9.1



More information about the Intel-gfx mailing list