[PATCH] hmmm

[Matthew Auld]

---
 drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index f27772f6779a..863f89bc3307 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1636,11 +1636,6 @@ static int igt_shrink_thp(void *arg)
 	if (err)
 		goto out_close;
 
-	if (obj->mm.page_sizes.phys < I915_GTT_PAGE_SIZE_2M) {
-		pr_info("failed to allocate THP, finishing test early\n");
-		goto out_unpin;
-	}
-
 	err = igt_check_page_sizes(vma);
 	if (err)
 		goto out_unpin;
@@ -1660,6 +1655,16 @@ static int igt_shrink_thp(void *arg)
 	if (err)
 		goto out_close;
 
+	i915_gem_object_lock(vma->obj);
+	err = i915_gem_object_set_to_cpu_domain(vma->obj, false);
+	i915_gem_object_unlock(vma->obj);
+	if (err)
+		goto out_close;
+
+	pr_info("pin_count(%d), bind_count(%d)\n",
+		atomic_read(&obj->mm.pages_pin_count),
+		atomic_read(&obj->bind_count));
+
 	/*
 	 * Now that the pages are *unpinned* shrink-all should invoke
 	 * shmem to truncate our pages.
-- 
2.20.1