diff mbox series

[v4,2/2] drm/i915: Migrate platform-dependent mock hugepage selftests to live

Message ID 20230227162108.2412264-2-jonathan.cavitt@intel.com (mailing list archive)
State New, archived
Headers show
Series [v4,1/2] drm/i915: Use correct huge page manager for MTL | expand

Commit Message

Cavitt, Jonathan Feb. 27, 2023, 4:21 p.m. UTC 
Convert the igt_mock_ppgtt_huge_fill and igt_mock_ppgtt_64K mock selftests into
live selftests as their requirements have recently become platform-dependent.
Additionally, apply necessary platform dependency checks to these tests.

Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
 .../gpu/drm/i915/gem/selftests/huge_pages.c   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

Comments

Matthew Auld Feb. 27, 2023, 5:19 p.m. UTC | #1 
On 27/02/2023 16:21, Jonathan Cavitt wrote:
> Convert the igt_mock_ppgtt_huge_fill and igt_mock_ppgtt_64K mock selftests into
> live selftests as their requirements have recently become platform-dependent.
> Additionally, apply necessary platform dependency checks to these tests.
> 
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>

The patch order should be the other way around. When the series is 
applied to drm-intel-gt-next, every commit should pretty much always be 
functional/bisectable. In this case the first patch by itself will make 
the mock tests fail, if we don't already have this patch applied. It's 
only a selftest so likely meh in practice, but in general we should 
always try to keep every commit functional/bisectable.

Otherwise for the series,
Reviewed-by: Matthew Auld <matthew.auld@intel.com>

> ---
>   .../gpu/drm/i915/gem/selftests/huge_pages.c   | 22 ++++++++++++++-----
>   1 file changed, 17 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 defece0bcb81..375f119ab261 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -710,7 +710,7 @@ static void close_object_list(struct list_head *objects,
>   	}
>   }
>   
> -static int igt_mock_ppgtt_huge_fill(void *arg)
> +static int igt_ppgtt_huge_fill(void *arg)
>   {
>   	struct i915_ppgtt *ppgtt = arg;
>   	struct drm_i915_private *i915 = ppgtt->vm.i915;
> @@ -784,7 +784,8 @@ static int igt_mock_ppgtt_huge_fill(void *arg)
>   		GEM_BUG_ON(!expected_gtt);
>   		GEM_BUG_ON(size);
>   
> -		if (expected_gtt & I915_GTT_PAGE_SIZE_4K)
> +		if (expected_gtt & I915_GTT_PAGE_SIZE_4K &&
> +		    GRAPHICS_VER_FULL(i915) < IP_VER(12, 50))
>   			expected_gtt &= ~I915_GTT_PAGE_SIZE_64K;
>   
>   		i915_vma_unpin(vma);
> @@ -831,7 +832,7 @@ static int igt_mock_ppgtt_huge_fill(void *arg)
>   	return err;
>   }
>   
> -static int igt_mock_ppgtt_64K(void *arg)
> +static int igt_ppgtt_64K(void *arg)
>   {
>   	struct i915_ppgtt *ppgtt = arg;
>   	struct drm_i915_private *i915 = ppgtt->vm.i915;
> @@ -913,6 +914,17 @@ static int igt_mock_ppgtt_64K(void *arg)
>   		unsigned int offset = objects[i].offset;
>   		unsigned int flags = PIN_USER;
>   
> +		/*
> +		 * For modern GTT models, the requirements for marking a page-table
> +		 * as 64K have been relaxed.  Account for this.
> +		 */
> +
> +		if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) {
> +			expected_gtt = 0;
> +			expected_gtt |= size & (SZ_64K | SZ_2M) ? I915_GTT_PAGE_SIZE_64K : 0;
> +			expected_gtt |= size & SZ_4K ? I915_GTT_PAGE_SIZE_4K : 0;
> +		}
> +
>   		for (single = 0; single <= 1; single++) {
>   			obj = fake_huge_pages_object(i915, size, !!single);
>   			if (IS_ERR(obj))
> @@ -1910,8 +1922,6 @@ int i915_gem_huge_page_mock_selftests(void)
>   		SUBTEST(igt_mock_exhaust_device_supported_pages),
>   		SUBTEST(igt_mock_memory_region_huge_pages),
>   		SUBTEST(igt_mock_ppgtt_misaligned_dma),
> -		SUBTEST(igt_mock_ppgtt_huge_fill),
> -		SUBTEST(igt_mock_ppgtt_64K),
>   	};
>   	struct drm_i915_private *dev_priv;
>   	struct i915_ppgtt *ppgtt;
> @@ -1962,6 +1972,8 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
>   		SUBTEST(igt_ppgtt_sanity_check),
>   		SUBTEST(igt_ppgtt_compact),
>   		SUBTEST(igt_ppgtt_mixed),
> +		SUBTEST(igt_ppgtt_huge_fill),
> +		SUBTEST(igt_ppgtt_64K),
>   	};
>   
>   	if (!HAS_PPGTT(i915)) {
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index defece0bcb81..375f119ab261 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -710,7 +710,7 @@  static void close_object_list(struct list_head *objects,
 	}
 }
 
-static int igt_mock_ppgtt_huge_fill(void *arg)
+static int igt_ppgtt_huge_fill(void *arg)
 {
 	struct i915_ppgtt *ppgtt = arg;
 	struct drm_i915_private *i915 = ppgtt->vm.i915;
@@ -784,7 +784,8 @@  static int igt_mock_ppgtt_huge_fill(void *arg)
 		GEM_BUG_ON(!expected_gtt);
 		GEM_BUG_ON(size);
 
-		if (expected_gtt & I915_GTT_PAGE_SIZE_4K)
+		if (expected_gtt & I915_GTT_PAGE_SIZE_4K &&
+		    GRAPHICS_VER_FULL(i915) < IP_VER(12, 50))
 			expected_gtt &= ~I915_GTT_PAGE_SIZE_64K;
 
 		i915_vma_unpin(vma);
@@ -831,7 +832,7 @@  static int igt_mock_ppgtt_huge_fill(void *arg)
 	return err;
 }
 
-static int igt_mock_ppgtt_64K(void *arg)
+static int igt_ppgtt_64K(void *arg)
 {
 	struct i915_ppgtt *ppgtt = arg;
 	struct drm_i915_private *i915 = ppgtt->vm.i915;
@@ -913,6 +914,17 @@  static int igt_mock_ppgtt_64K(void *arg)
 		unsigned int offset = objects[i].offset;
 		unsigned int flags = PIN_USER;
 
+		/*
+		 * For modern GTT models, the requirements for marking a page-table
+		 * as 64K have been relaxed.  Account for this.
+		 */
+
+		if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) {
+			expected_gtt = 0;
+			expected_gtt |= size & (SZ_64K | SZ_2M) ? I915_GTT_PAGE_SIZE_64K : 0;
+			expected_gtt |= size & SZ_4K ? I915_GTT_PAGE_SIZE_4K : 0;
+		}
+
 		for (single = 0; single <= 1; single++) {
 			obj = fake_huge_pages_object(i915, size, !!single);
 			if (IS_ERR(obj))
@@ -1910,8 +1922,6 @@  int i915_gem_huge_page_mock_selftests(void)
 		SUBTEST(igt_mock_exhaust_device_supported_pages),
 		SUBTEST(igt_mock_memory_region_huge_pages),
 		SUBTEST(igt_mock_ppgtt_misaligned_dma),
-		SUBTEST(igt_mock_ppgtt_huge_fill),
-		SUBTEST(igt_mock_ppgtt_64K),
 	};
 	struct drm_i915_private *dev_priv;
 	struct i915_ppgtt *ppgtt;
@@ -1962,6 +1972,8 @@  int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
 		SUBTEST(igt_ppgtt_sanity_check),
 		SUBTEST(igt_ppgtt_compact),
 		SUBTEST(igt_ppgtt_mixed),
+		SUBTEST(igt_ppgtt_huge_fill),
+		SUBTEST(igt_ppgtt_64K),
 	};
 
 	if (!HAS_PPGTT(i915)) {