[Intel-gfx] [PATCH 30/30] HAX: Enable HuC

[Michal Wajdeczko]

For now, we only want to test "enable_guc=2" configuration.

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

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 3f14e9881a0d..e28ae23de516 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -54,7 +54,7 @@ struct drm_printer;
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc, 0) \
+	param(int, enable_guc, -1) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index a522889c542f..d13597246302 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -67,6 +67,9 @@ static int __get_platform_enable_guc(struct drm_i915_private *i915)
 	if (INTEL_GEN(i915) < 11)
 		enable_guc &= ~ENABLE_GUC_SUBMISSION;
 
+	/* HAX: Never allow GuC submission */
+	enable_guc &= ~ENABLE_GUC_SUBMISSION;
+
 	return enable_guc;
 }
 
-- 
2.19.2