diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-02-02 03:49:59 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-02-02 03:49:59 +0000 |
| commit | 6a1c121fd59f0d304b69ca2980635714647d9039 (patch) | |
| tree | 7a7439199b31cdb50559ecbe11f326e29f0329c5 /sys/dev | |
| parent | b5e8cb40d82ba838a47fe5d98d944c8006fa93a5 (diff) | |
drm/i915/selftests: Unwind hugepages to drop wakeref on error
From Chris Wilson
d5fb544b4ce56316bdfd542511dcd34c5798c3b8 in linux-6.1.y/6.1.9
93eea624526fc7d070cdae463408665824075f54 in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/gem/selftests/huge_pages.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/i915/gem/selftests/huge_pages.c b/sys/dev/pci/drm/i915/gem/selftests/huge_pages.c index a4912749d4d..6fe080abd73 100644 --- a/sys/dev/pci/drm/i915/gem/selftests/huge_pages.c +++ b/sys/dev/pci/drm/i915/gem/selftests/huge_pages.c @@ -1697,7 +1697,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 @@ -1713,19 +1713,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); |