[PATCH 26/26] HAX: drm/i915/guc: enable GuC by default on all integrated gen12

[Daniele Ceraolo Spurio]

For testing only. Also WA a couple of existing issues with slpc.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
---
 drivers/gpu/drm/i915/gt/intel_rps.c     | 11 +++++++++--
 drivers/gpu/drm/i915/gt/selftest_slpc.c |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc.c   |  9 +--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index 3489f5f0cac1..604259716461 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -1982,9 +1982,16 @@ static u32 intel_rps_get_req(u32 pureq)
 
 u32 intel_rps_read_punit_req_frequency(struct intel_rps *rps)
 {
-	u32 freq = intel_rps_get_req(intel_rps_read_punit_req(rps));
+	struct intel_runtime_pm *rpm = rps_to_uncore(rps)->rpm;
+	intel_wakeref_t wakeref;
+	u32 freq = 0;
 
-	return intel_gpu_freq(rps, freq);
+	with_intel_runtime_pm_if_in_use(rpm, wakeref) {
+		freq = intel_rps_get_req(intel_rps_read_punit_req(rps));
+		freq = intel_gpu_freq(rps, freq);
+	}
+
+	return freq;
 }
 
 u32 intel_rps_get_requested_frequency(struct intel_rps *rps)
diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
index 9334bad131a2..c523352ee874 100644
--- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
@@ -304,7 +304,7 @@ int intel_slpc_live_selftests(struct drm_i915_private *i915)
 		SUBTEST(live_slpc_clamp_min),
 	};
 
-	if (intel_gt_is_wedged(&i915->gt))
+	if (1 || intel_gt_is_wedged(&i915->gt))
 		return 0;
 
 	return i915_live_subtests(tests, i915);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 86c318516e14..b0a70dc1d6d3 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -28,14 +28,7 @@ static void uc_expand_default_options(struct intel_uc *uc)
 		return;
 	}
 
-	/* Don't enable GuC/HuC on older Gen12 platforms */
-	if (IS_TIGERLAKE(i915) || IS_ROCKETLAKE(i915)) {
-		i915->params.enable_guc = 0;
-		return;
-	}
-
-	/* Intermediate platforms are HuC authentication only */
-	if (IS_DG1(i915) || IS_ALDERLAKE_S(i915)) {
+	if (IS_DG1(i915)) {
 		i915->params.enable_guc = ENABLE_GUC_LOAD_HUC;
 		return;
 	}
-- 
2.25.1