From: Michal Wajdeczko <michal.wajdec...@intel.com>

v2: except running with HYPERVISOR
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 drivers/gpu/drm/i915/intel_uc.c    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_params.h 
b/drivers/gpu/drm/i915/i915_params.h
index 430f5f9d0ff4..3deae1e22974 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,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, 0) \
        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 1c1a00df010b..cfa21f6058a5 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private 
*dev_priv)
                enable_guc |= ENABLE_GUC_LOAD_HUC;
 
        /* Any platform specific fine-tuning can be done here */
+       if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
+               enable_guc = 0;
 
        return enable_guc;
 }
-- 
2.16.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to