From 93eea624526fc7d070cdae463408665824075f54 Mon Sep 17 00:00:00 2001

From: Chris Wilson <chris.p.wilson@linux.intel.com>

Date: Tue, 17 Jan 2023 13:32:34 +0100

Subject: drm/i915/selftests: Unwind hugepages to drop wakeref on error

Git-commit: 93eea624526fc7d070cdae463408665824075f54

Patch-mainline: v6.2-rc5

References: git-fixes

Make sure that upon error after we have acquired the wakeref we do

release it again.

v2: add another missing "goto out_wf"(Andi).

Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")

Cc: Andi Shyti <andi.shyti@linux.intel.com>

Reviewed-by: Matthew Auld <matthew.auld@intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>

Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>

Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>

Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>

Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>

Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20230117123234.26487-1-nirmoy.das@intel.com

(cherry picked from commit 14ec40a88210151296fff3e981c1a7196ad9bf55)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Acked-by: Patrik Jakobsson <pjakobsson@suse.de>

---

 drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c

index beaf27e09e8a..977dead10ab5 100644

--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c

@@ -1847,7 +1847,7 @@ static int igt_shrink_thp(void *arg)

 			I915_SHRINK_ACTIVE);

 	i915_vma_unpin(vma);

 	if (err)

-		goto out_put;

+		goto out_wf;

 	/*

 	 * Now that the pages are *unpinned* shrinking should invoke

@@ -1863,19 +1863,19 @@ static int igt_shrink_thp(void *arg)

 		pr_err("unexpected pages mismatch, should_swap=%s\n",

 		       str_yes_no(should_swap));

 		err = -EINVAL;

-		goto out_put;

+		goto out_wf;

 	}

 	if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {

 		pr_err("unexpected residual page-size bits, should_swap=%s\n",

 		       str_yes_no(should_swap));

 		err = -EINVAL;

-		goto out_put;

+		goto out_wf;

 	}

 	err = i915_vma_pin(vma, 0, 0, flags);

 	if (err)

-		goto out_put;

+		goto out_wf;

 	while (n--) {

 		err = cpu_check(obj, n, 0xdeadbeaf);

-- 

2.39.0