From: Chris Wilson Date: Tue, 7 Nov 2017 11:05:59 +0000 (+0000) Subject: drm/i915/selftests: Skip mixed page exhaustion if only small pages available X-Git-Tag: v4.16-rc1~31^2~35^2~114 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6d03042b9ad514077175b5cc53069e0a364d0ec;p=uclinux-h8%2Flinux.git drm/i915/selftests: Skip mixed page exhaustion if only small pages available If we only have 4k pages, we can't mix together different combinations of hugepages to see if the world burns. However, as the loops did nothing, we never set err to 0 and reported ENODEV aborting the test. Teach the test to skip instead. Signed-off-by: Chris Wilson Cc: Matthew Auld Cc: Joonas Lahtinen Link: https://patchwork.freedesktop.org/patch/msgid/20171107110559.6098-1-chris@chris-wilson.co.uk Reviewed-by: Matthew Auld --- diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c index 5cc8101bb2b1..01af540b6ef9 100644 --- a/drivers/gpu/drm/i915/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/selftests/huge_pages.c @@ -1159,6 +1159,9 @@ static int igt_ppgtt_exhaust_huge(void *arg) int n, i; int err = -ENODEV; + if (supported == I915_GTT_PAGE_SIZE_4K) + return 0; + /* * Sanity check creating objects with a varying mix of page sizes -- * ensuring that our writes lands in the right place.