Skip to content

Commit bb7e19b

Browse files
committed
Merge tag 'drm-intel-fixes-2024-09-12' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- Prevent a possible int overflow in wq offsets [guc] (Nikita Zhandarovich) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Tvrtko Ursulin <tursulin@igalia.com> Link: https://patchwork.freedesktop.org/patch/msgid/ZuKTN2XngNhBB3z3@linux
2 parents f5d6c41 + d3d37f7 commit bb7e19b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2842,9 +2842,9 @@ static void prepare_context_registration_info_v70(struct intel_context *ce,
28422842
ce->parallel.guc.wqi_tail = 0;
28432843
ce->parallel.guc.wqi_head = 0;
28442844

2845-
wq_desc_offset = i915_ggtt_offset(ce->state) +
2845+
wq_desc_offset = (u64)i915_ggtt_offset(ce->state) +
28462846
__get_parent_scratch_offset(ce);
2847-
wq_base_offset = i915_ggtt_offset(ce->state) +
2847+
wq_base_offset = (u64)i915_ggtt_offset(ce->state) +
28482848
__get_wq_offset(ce);
28492849
info->wq_desc_lo = lower_32_bits(wq_desc_offset);
28502850
info->wq_desc_hi = upper_32_bits(wq_desc_offset);

0 commit comments

Comments
 (0)