diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2022-07-11 11:58:59 +0300 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2022-07-11 18:35:37 +0300 |
| commit | bc99f1209f19fefa3ee11e77464ccfae541f4291 (patch) | |
| tree | 8b51fff7ee7377908cb8efda769d4d0381a0111f /drivers/gpu/drm/i915/i915_scatterlist.h | |
| parent | d50f5a109cf4ed50c5b575c1bb5fc3bd17b23308 (diff) | |
| download | linux-bc99f1209f19fefa3ee11e77464ccfae541f4291.tar.xz | |
drm/i915/ttm: fix sg_table construction
If we encounter some monster sized local-memory page that exceeds the
maximum sg length (UINT32_MAX), ensure that don't end up with some
misaligned address in the entry that follows, leading to fireworks
later. Also ensure we have some coverage of this in the selftests.
v2(Chris):
- Use round_down consistently to avoid udiv errors
v3(Nirmoy):
- Also update the max_segment in the selftest
Fixes: f701b16d4cc5 ("drm/i915/ttm: add i915_sg_from_buddy_resource")
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6379
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Nirmoy Das <nirmoy.das@linux.intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220711085859.24198-1-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_scatterlist.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_scatterlist.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_scatterlist.h b/drivers/gpu/drm/i915/i915_scatterlist.h index 12c6a1684081..b13e4cdea923 100644 --- a/drivers/gpu/drm/i915/i915_scatterlist.h +++ b/drivers/gpu/drm/i915/i915_scatterlist.h @@ -213,9 +213,11 @@ static inline void __i915_refct_sgt_init(struct i915_refct_sgt *rsgt, void i915_refct_sgt_init(struct i915_refct_sgt *rsgt, size_t size); struct i915_refct_sgt *i915_rsgt_from_mm_node(const struct drm_mm_node *node, - u64 region_start); + u64 region_start, + u64 page_alignment); struct i915_refct_sgt *i915_rsgt_from_buddy_resource(struct ttm_resource *res, - u64 region_start); + u64 region_start, + u64 page_alignment); #endif |