[Intel-gfx] [PATCH 2/2] HAX: force enable_guc=2 and WA i915#571

[Fernando Pacheco]

From: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>

To get a full run with GuC loading and HuC auth enabled.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>
---
 drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 9 +++++++++
 drivers/gpu/drm/i915/i915_params.h       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c 
b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
index 09ff8e4f88af..86b176c887b4 100644
--- a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
@@ -12,8 +12,11 @@ static int live_gt_resume(void *arg)
 {
        struct intel_gt *gt = arg;
        IGT_TIMEOUT(end_time);
+       intel_wakeref_t wakeref;
        int err;
 
+       wakeref = intel_runtime_pm_get(gt->uncore->rpm);
+
        /* Do several suspend/resume cycles to check we don't explode! */
        do {
                intel_gt_suspend_prepare(gt);
@@ -26,6 +29,10 @@ static int live_gt_resume(void *arg)
                        break;
                }
 
+               err = intel_gt_init_hw(gt);
+               if (err)
+                       break;
+
                err = intel_gt_resume(gt);
                if (err)
                        break;
@@ -45,6 +52,8 @@ static int live_gt_resume(void *arg)
                }
        } while (!__igt_timeout(end_time, NULL));
 
+       intel_runtime_pm_put(gt->uncore->rpm, wakeref);
+
        return err;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_params.h 
b/drivers/gpu/drm/i915/i915_params.h
index 31b88f297fbc..acda9f2a1207 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -54,7 +54,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, 2) \
        param(int, guc_log_level, -1) \
        param(char *, guc_firmware_path, NULL) \
        param(char *, huc_firmware_path, NULL) \
-- 
2.24.0

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