Merge drm/drm-next into drm-intel-next

[linux-block.git] / drivers / gpu / drm / i915 / gem / selftests / huge_pages.c

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index 7a84fa68a99ca09e06e7fe80e506aae88de3e3be..ef15967be51a5d80586def3573404f0b9af6059f 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -5,6 +5,8 @@
  */
 
 #include <linux/prime_numbers.h>
+#include <linux/string_helpers.h>
+#include <linux/swap.h>
 
 #include "i915_selftest.h"
 
@@ -804,7 +806,7 @@ static int igt_mock_ppgtt_huge_fill(void *arg)
                if (vma->resource->page_sizes_gtt != expected_gtt) {
                        pr_err("gtt=%u, expected=%u, size=%zd, single=%s\n",
                               vma->resource->page_sizes_gtt, expected_gtt,
-                              obj->base.size, yesno(!!single));
+                              obj->base.size, str_yes_no(!!single));
                        err = -EINVAL;
                        break;
                }
@@ -960,7 +962,7 @@ static int igt_mock_ppgtt_64K(void *arg)
                        if (vma->resource->page_sizes_gtt != expected_gtt) {
                                pr_err("gtt=%u, expected=%u, i=%d, single=%s\n",
                                       vma->resource->page_sizes_gtt,
-                                      expected_gtt, i, yesno(!!single));
+                                      expected_gtt, i, str_yes_no(!!single));
                                err = -EINVAL;
                                goto out_vma_unpin;
                        }
@@ -1706,14 +1708,14 @@ static int igt_shrink_thp(void *arg)
                        I915_SHRINK_WRITEBACK);
        if (should_swap == i915_gem_object_has_pages(obj)) {
                pr_err("unexpected pages mismatch, should_swap=%s\n",
-                      yesno(should_swap));
+                      str_yes_no(should_swap));
                err = -EINVAL;
                goto out_put;
        }
 
        if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
                pr_err("unexpected residual page-size bits, should_swap=%s\n",
-                      yesno(should_swap));
+                      str_yes_no(should_swap));
                err = -EINVAL;
                goto out_put;
        }