Commit bb7e19bd authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-intel-fixes-2024-09-12' of...

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: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZuKTN2XngNhBB3z3@linux
parents f5d6c413 d3d37f74
...@@ -2842,9 +2842,9 @@ static void prepare_context_registration_info_v70(struct intel_context *ce, ...@@ -2842,9 +2842,9 @@ static void prepare_context_registration_info_v70(struct intel_context *ce,
ce->parallel.guc.wqi_tail = 0; ce->parallel.guc.wqi_tail = 0;
ce->parallel.guc.wqi_head = 0; ce->parallel.guc.wqi_head = 0;
wq_desc_offset = i915_ggtt_offset(ce->state) + wq_desc_offset = (u64)i915_ggtt_offset(ce->state) +
__get_parent_scratch_offset(ce); __get_parent_scratch_offset(ce);
wq_base_offset = i915_ggtt_offset(ce->state) + wq_base_offset = (u64)i915_ggtt_offset(ce->state) +
__get_wq_offset(ce); __get_wq_offset(ce);
info->wq_desc_lo = lower_32_bits(wq_desc_offset); info->wq_desc_lo = lower_32_bits(wq_desc_offset);
info->wq_desc_hi = upper_32_bits(wq_desc_offset); info->wq_desc_hi = upper_32_bits(wq_desc_offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment