[PATCH 1/1] drm/i915: HAX-for-fdo-110829.patch

[don.hiatt at intel.com]

From: Don Hiatt <don.hiatt at intel.com>

HACK: Force enable_guc=0

Signed-off-by: Don Hiatt <don.hiatt at intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 29a9eec60d2e..6f172f142d5a 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -42,6 +42,12 @@ static void __confirm_options(struct intel_uc *uc)
 {
 	struct drm_i915_private *i915 = uc_to_gt(uc)->i915;
 
+	// HACK!! Make sure enable_guc is off
+	if (i915_modparams.enable_guc) {
+		i915_modparams.enable_guc = 0;
+		DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "!!! Disabling GuC!\n");
+	}
+
 	DRM_DEV_DEBUG_DRIVER(i915->drm.dev,
 			     "enable_guc=%d (guc:%s submission:%s huc:%s)\n",
 			     i915_modparams.enable_guc,
-- 
2.20.1