diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-09-13 04:18:12 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-09-13 04:18:12 +0200 |
| commit | bb7e19bd6cb68e08272e08acb814b9342ad5a43d (patch) | |
| tree | 8f022f5ed2aa7eb595d1fd823bf274a6eab71a37 /drivers/gpu | |
| parent | Merge tag 'amd-drm-fixes-6.11-2024-09-11' of https://gitlab.freedesktop.org/a... (diff) | |
| parent | drm/i915/guc: prevent a possible int overflow in wq offsets (diff) | |
| download | linux-bb7e19bd6cb68e08272e08acb814b9342ad5a43d.tar.xz linux-bb7e19bd6cb68e08272e08acb814b9342ad5a43d.zip | |
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 9400d0eb682b..908ebfa22933 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -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_head = 0; - wq_desc_offset = i915_ggtt_offset(ce->state) + + wq_desc_offset = (u64)i915_ggtt_offset(ce->state) + __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); info->wq_desc_lo = lower_32_bits(wq_desc_offset); info->wq_desc_hi = upper_32_bits(wq_desc_offset); |