Skip to content

Commit 93eea62

Browse files
Chris Wilsonrodrigovivi
authored andcommitted
drm/i915/selftests: Unwind hugepages to drop wakeref on error
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: 027c38b ("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 14ec40a) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 67b0b4e commit 93eea62

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@ static int igt_shrink_thp(void *arg)
18471847
I915_SHRINK_ACTIVE);
18481848
i915_vma_unpin(vma);
18491849
if (err)
1850-
goto out_put;
1850+
goto out_wf;
18511851

18521852
/*
18531853
* Now that the pages are *unpinned* shrinking should invoke
@@ -1863,19 +1863,19 @@ static int igt_shrink_thp(void *arg)
18631863
pr_err("unexpected pages mismatch, should_swap=%s\n",
18641864
str_yes_no(should_swap));
18651865
err = -EINVAL;
1866-
goto out_put;
1866+
goto out_wf;
18671867
}
18681868

18691869
if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
18701870
pr_err("unexpected residual page-size bits, should_swap=%s\n",
18711871
str_yes_no(should_swap));
18721872
err = -EINVAL;
1873-
goto out_put;
1873+
goto out_wf;
18741874
}
18751875

18761876
err = i915_vma_pin(vma, 0, 0, flags);
18771877
if (err)
1878-
goto out_put;
1878+
goto out_wf;
18791879

18801880
while (n--) {
18811881
err = cpu_check(obj, n, 0xdeadbeaf);

0 commit comments

Comments
 (0)