We shouldn't be holding the forcewake whilst going through suspend-resume cycle, so instead of globally holding the forcewake we reduce this to when we actually need to read the registers.
Cc: Chris Wilson <[email protected]> Signed-off-by: Matthew Auld <[email protected]> --- tests/gem_workarounds.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/gem_workarounds.c b/tests/gem_workarounds.c index e419e8b..74799fd 100644 --- a/tests/gem_workarounds.c +++ b/tests/gem_workarounds.c @@ -67,6 +67,8 @@ static int workaround_fail_count(void) { int i, fail_count = 0; + intel_register_access_init(intel_get_pci_device(), 0); + /* There is a small delay after coming ot of rc6 to the correct render context values will get loaded by hardware (bdw,chv). This here ensures that we have the correct context loaded before @@ -93,6 +95,8 @@ static int workaround_fail_count(void) } } + intel_register_access_fini(); + return fail_count; } @@ -131,8 +135,6 @@ igt_main pci_dev = intel_get_pci_device(); igt_require(pci_dev); - intel_register_access_init(pci_dev, 0); - file = igt_debugfs_fopen("i915_wa_registers", "r"); igt_assert(getline(&line, &line_size, file) > 0); igt_debug("i915_wa_registers: %s", line); @@ -173,7 +175,6 @@ igt_main igt_fixture { free(wa_regs); - intel_register_access_fini(); } } -- 2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
