[2/2] HAX Enable HuC testing without GuC submission

Submitted by Anusha on Dec. 6, 2018, 11:18 p.m.

Details

Message ID 20181206231809.13384-3-anusha.srivatsa@intel.com
State New
Series "HuC Update for BXT"
Headers show

Commit Message

Anusha Dec. 6, 2018, 11:18 p.m.
From: Michal Wajdeczko <michal.wajdeczko@intel.com>

This will let the driver decide where GuC can be used

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@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(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 7e56c516c815..c681537bcb92 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -45,7 +45,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 b34c318b238d..4cc42e0645f3 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -64,6 +64,9 @@  static int __get_platform_enable_guc(struct drm_i915_private *i915)
 
 	/* Any platform specific fine-tuning can be done here */
 
+	/* HAX: Do not enable GuC submission in auto mode */
+	enable_guc &= ~ENABLE_GUC_SUBMISSION;
+
 	return enable_guc;
 }