[PATCH 9/9] grrr

Matthew Auld matthew.auld at intel.com
Fri Jun 11 09:21:37 UTC 2021


---
 drivers/gpu/drm/i915/i915_scatterlist.c              | 2 +-
 drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_scatterlist.c b/drivers/gpu/drm/i915/i915_scatterlist.c
index 98e99f20c156..957a300934ea 100644
--- a/drivers/gpu/drm/i915/i915_scatterlist.c
+++ b/drivers/gpu/drm/i915/i915_scatterlist.c
@@ -126,7 +126,7 @@ struct sg_table *i915_sg_from_buddy_resource(struct ttm_resource *res,
 	struct i915_ttm_buddy_resource *bman_res = to_ttm_buddy_resource(res);
 	struct i915_buddy_mm *mm = bman_res->mm;
 	const u64 size = res->num_pages << PAGE_SHIFT;
-	const u64 max_segment = UINT_MAX;
+	const u64 max_segment = rounddown(UINT_MAX, PAGE_SIZE);
 	struct list_head *blocks = &bman_res->blocks;
 	struct i915_buddy_block *block;
 	struct scatterlist *sg;
diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index e9d46efa73ca..118a66c29695 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -447,7 +447,7 @@ static int igt_mock_splintered_region(void *arg)
 
 static int igt_mock_max_segment(void *arg)
 {
-	const unsigned int max_segment = i915_sg_segment_size();
+	const unsigned int max_segment = rounddown(UINT_MAX, PAGE_SIZE);
 	struct intel_memory_region *mem = arg;
 	struct drm_i915_private *i915 = mem->i915;
 	struct i915_ttm_buddy_resource *res;
-- 
2.26.3



More information about the Intel-gfx-trybot mailing list