aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>2022-05-10 23:02:28 -0700
committerMatt Roper <matthew.d.roper@intel.com>2022-05-24 12:26:26 -0700
commita4f263f46961b1229b10ca3a98f0be618a9d47ac (patch)
treebcd556aac5b4e04c4e575a76c4ef9e9b3f9332cc
parentdrm/i915/pvc: Add new BCS engines to GuC engine list (diff)
downloadwireguard-linux-a4f263f46961b1229b10ca3a98f0be618a9d47ac.tar.xz
wireguard-linux-a4f263f46961b1229b10ca3a98f0be618a9d47ac.zip
drm/i915/guc: XEHPSDV and PVC do not use HuC
Disable HuC loading since it is not used on these platforms. Cc: Stuart Summers <stuart.summers@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220511060228.1179450-6-matthew.d.roper@intel.com
-rw-r--r--drivers/gpu/drm/i915/gt/uc/intel_uc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 3c3527cb0007..f2e7c82985ef 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -45,6 +45,10 @@ static void uc_expand_default_options(struct intel_uc *uc)
/* Default: enable HuC authentication and GuC submission */
i915->params.enable_guc = ENABLE_GUC_LOAD_HUC | ENABLE_GUC_SUBMISSION;
+
+ /* XEHPSDV and PVC do not use HuC */
+ if (IS_XEHPSDV(i915) || IS_PONTEVECCHIO(i915))
+ i915->params.enable_guc &= ~ENABLE_GUC_LOAD_HUC;
}
/* Reset GuC providing us with fresh state for both GuC and HuC.