drm/i915/gt: enable GuC/HuC on supported platforms by default

moetayuko · Jan 27, 2024 · db3c10b · db3c10b
1 parent f23fc66
commit db3c10b
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -34,20 +34,14 @@ static void uc_expand_default_options(struct intel_uc *uc)
 	if (i915->params.enable_guc != -1)
 		return;
 
-	/* Don't enable GuC/HuC on pre-Gen12 */
-	if (GRAPHICS_VER(i915) < 12) {
-		i915->params.enable_guc = 0;
-		return;
-	}
-
-	/* Don't enable GuC/HuC on older Gen12 platforms */
-	if (IS_TIGERLAKE(i915) || IS_ROCKETLAKE(i915)) {
+	/* Don't enable GuC/HuC on pre-Gen9 */
+	if (GRAPHICS_VER(i915) < 9) {
 		i915->params.enable_guc = 0;
 		return;
 	}
 
-	/* Intermediate platforms are HuC authentication only */
-	if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) {
+	/* Enable HuC on pre-Gen12 */
+	if (GRAPHICS_VER(i915) < 12) {
 		i915->params.enable_guc = ENABLE_GUC_LOAD_HUC;
 		return;
 	}